summaryrefslogtreecommitdiff
path: root/Build/source/libs/gd/libgd-src/src/gdpp.h
diff options
context:
space:
mode:
Diffstat (limited to 'Build/source/libs/gd/libgd-src/src/gdpp.h')
-rw-r--r--Build/source/libs/gd/libgd-src/src/gdpp.h22
1 files changed, 3 insertions, 19 deletions
diff --git a/Build/source/libs/gd/libgd-src/src/gdpp.h b/Build/source/libs/gd/libgd-src/src/gdpp.h
index 2ebda162e1c..3d58d899eed 100644
--- a/Build/source/libs/gd/libgd-src/src/gdpp.h
+++ b/Build/source/libs/gd/libgd-src/src/gdpp.h
@@ -1,5 +1,4 @@
/* *****************************************************************************
-** $Id$
** Initial file written and documented by:
** Kevin Shepherd <kshepherd@php.net> December 2007
** of Scarlet Line http://www.scarletline.com/
@@ -20,13 +19,9 @@
im.Gif(out);
}
*/
-#ifdef __cplusplus
#ifndef _gdpp_h
#define _gdpp_h
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#ifdef __cplusplus
#include "gd_io_stream.h"
#include <string>
@@ -292,7 +287,7 @@ public:
:im(0) {
CreateFrom(size, data);
}
-#ifdef HAVE_LIBPNG
+
/** Construct an image by reading from \p in.
The tag is an empty struct which simply tells the compiler which image read function to use.
e.g. GD::Image img(input, GD::Png_tag()); // read a png file from input
@@ -330,7 +325,6 @@ public:
:im(0) {
CreateFromPng(size, data);
}
-#endif
/** Construct an image by reading from \p in.
The tag is an empty struct which simply tells the compiler which image read function to use.
@@ -408,7 +402,6 @@ public:
CreateFromWBMP(size, data);
}
-#ifdef HAVE_LIBJPEG
/** Construct an image by reading from \p in.
The tag is an empty struct which simply tells the compiler which image read function to use.
e.g. GD::Image img(input, GD::Jpeg_tag()); // read a jpeg file from input
@@ -446,7 +439,6 @@ public:
:im(0) {
CreateFromJpeg(size, data);
}
-#endif
/** Construct an image by reading from \p in.
The tag is an empty struct which simply tells the compiler which image read function to use.
@@ -608,7 +600,6 @@ public:
/// Read an image from a memory block, after determining the image format
bool CreateFrom(int size, void * data);
-#ifdef HAVE_LIBPNG
// Png
bool CreateFromPng(FILE * in) {
clear();
@@ -627,7 +618,6 @@ public:
istreamIOCtx _in_ctx(in);
return ((im = gdImageCreateFromPngCtx( & _in_ctx)) != 0);
}
-#endif
// Gif
bool CreateFromGif(FILE * in) {
@@ -666,7 +656,6 @@ public:
return ((im = gdImageCreateFromWBMPCtx( & _in_ctx)) != 0);
}
-#ifdef HAVE_LIBJPEG
// Jpeg
/**
Load a truecolor image from a JPEG format file.
@@ -720,7 +709,6 @@ public:
istreamIOCtx _in_ctx(in);
return ((im = gdImageCreateFromJpegCtx( & _in_ctx)) != 0);
}
-#endif
// Gd
bool CreateFromGd(FILE * in) {
@@ -1089,7 +1077,6 @@ public:
gdImageGifCtx(im, & _out_ctx);
}
-#ifdef HAVE_LIBPNG
/**
Write out this image in PNG file format to \p out.
\param out A FILE * handle
@@ -1154,7 +1141,6 @@ public:
ostreamIOCtx _out_ctx(out);
gdImagePngCtxEx(im, & _out_ctx, level);
}
-#endif
/**
Write out this image in WBMP file format ( black and white only ) to \p out.
@@ -1191,7 +1177,6 @@ public:
gdImageWBMPCtx(im, fg, & _out_ctx);
}
-#ifdef HAVE_LIBJPEG
/**
Write out this image in JPEG file format to \p out.
\param out A FILE * handle
@@ -1226,7 +1211,6 @@ public:
ostreamIOCtx _out_ctx(out);
gdImageJpegCtx(im, & _out_ctx, quality);
}
-#endif
void GifAnimBegin(FILE * out, int GlobalCM, int Loops) const {
gdImageGifAnimBegin(im, out, GlobalCM, Loops);
@@ -1542,5 +1526,5 @@ protected:
/// Read in an image from a standard library input stream
std::istream & operator>> (std::istream & in, GD::Image & img);
-#endif /* _gdpp_h */
#endif /* __cplusplus */
+#endif /* _gdpp_h */