parent
3b89ca6766
commit
b73137fcd4
|
@ -49,7 +49,6 @@ namespace GD
|
|||
case 0x47: // GIF
|
||||
rtn = CreateFromGif(in);
|
||||
break;
|
||||
#ifdef HAVE_LIBJPEG
|
||||
/* JPEG
|
||||
A JFIF-standard file will start with the four bytes (hex) FF D8 FF E0,
|
||||
followed by two variable bytes (often hex 00 10), followed by 'JFIF'.
|
||||
|
@ -57,7 +56,6 @@ namespace GD
|
|||
case 0xFF: // JPEG
|
||||
rtn = CreateFromJpeg(in);
|
||||
break;
|
||||
#endif
|
||||
/* WBMP
|
||||
WBMP Type 0: B/W, Uncompressed bitmap is the only gd supported type
|
||||
*/
|
||||
|
@ -136,7 +134,6 @@ namespace GD
|
|||
rtn = CreateFromGif(in);
|
||||
break;
|
||||
|
||||
#ifdef HAVE_LIBJPEG
|
||||
/* JPEG
|
||||
A JFIF-standard file will start with the four bytes (hex) FF D8 FF E0,
|
||||
followed by two variable bytes (often hex 00 10), followed by 'JFIF'.
|
||||
|
@ -144,7 +141,6 @@ namespace GD
|
|||
case 0xFF: // JPEG
|
||||
rtn = CreateFromJpeg(in);
|
||||
break;
|
||||
#endif
|
||||
|
||||
/* WBMP
|
||||
WBMP Type 0: B/W, Uncompressed bitmap is the only gd supported type
|
||||
|
@ -205,7 +201,6 @@ namespace GD
|
|||
rtn = CreateFromGif(size, data);
|
||||
break;
|
||||
|
||||
#ifdef HAVE_LIBJPEG
|
||||
/* JPEG
|
||||
A JFIF-standard file will start with the four bytes (hex) FF D8 FF E0,
|
||||
followed by two variable bytes (often hex 00 10), followed by 'JFIF'.
|
||||
|
@ -213,7 +208,6 @@ namespace GD
|
|||
case 0xFF: // JPEG
|
||||
rtn = CreateFromJpeg(size, data);
|
||||
break;
|
||||
#endif
|
||||
|
||||
/* WBMP
|
||||
WBMP Type 0: B/W, Uncompressed bitmap is the only gd supported type
|
||||
|
|
12
src/gdpp.h
12
src/gdpp.h
|
@ -23,10 +23,6 @@
|
|||
#define _gdpp_h
|
||||
#ifdef __cplusplus
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include "config.h"
|
||||
#endif
|
||||
|
||||
#include "gd_io_stream.h"
|
||||
#include <string>
|
||||
|
||||
|
@ -406,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
|
||||
|
@ -444,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.
|
||||
|
@ -662,7 +656,6 @@ public:
|
|||
return ((im = gdImageCreateFromWBMPCtx( & _in_ctx)) != 0);
|
||||
}
|
||||
|
||||
#ifdef HAVE_LIBJPEG
|
||||
// Jpeg
|
||||
/**
|
||||
Load a truecolor image from a JPEG format file.
|
||||
|
@ -716,7 +709,6 @@ public:
|
|||
istreamIOCtx _in_ctx(in);
|
||||
return ((im = gdImageCreateFromJpegCtx( & _in_ctx)) != 0);
|
||||
}
|
||||
#endif
|
||||
|
||||
// Gd
|
||||
bool CreateFromGd(FILE * in) {
|
||||
|
@ -1085,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
|
||||
|
@ -1150,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.
|
||||
|
@ -1187,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
|
||||
|
@ -1222,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);
|
||||
|
|
Loading…
Reference in New Issue