summaryrefslogtreecommitdiff
path: root/libcore/imageloader.h
diff options
context:
space:
mode:
authorManuel Reimer <manuel.reimer@gmx.de>2014-11-10 16:32:38 +0100
committerManuel Reimer <manuel.reimer@gmx.de>2014-11-10 16:32:38 +0100
commit529039e24cb61d038fb065f8026b2e97f79ccdf9 (patch)
treec87cebcc439a0ab373fa6354547c024c8cc06f48 /libcore/imageloader.h
parent955da7682808d806e5f967b68e02a50e61bf876c (diff)
downloadvdr-plugin-skindesigner-529039e24cb61d038fb065f8026b2e97f79ccdf9.tar.gz
vdr-plugin-skindesigner-529039e24cb61d038fb065f8026b2e97f79ccdf9.tar.bz2
Fixed all compiler warnings for imageloader code
Diffstat (limited to 'libcore/imageloader.h')
-rw-r--r--libcore/imageloader.h30
1 files changed, 3 insertions, 27 deletions
diff --git a/libcore/imageloader.h b/libcore/imageloader.h
index a1a11de..a06f433 100644
--- a/libcore/imageloader.h
+++ b/libcore/imageloader.h
@@ -48,35 +48,10 @@ private:
};
// Image importer for JPG
-
#if BITS_IN_JSAMPLE != 8
#error libjpeg has to be compiled with 8-bit samples!
#endif
-struct my_error_mgr {
- struct jpeg_error_mgr pub; // "public" fields
- jmp_buf setjmp_buffer; // for return to caller
-};
-
-METHODDEF(void)
-my_error_exit(j_common_ptr cinfo) {
- // cinfo->err really points to a my_error_mgr struct, so coerce pointer
- my_error_mgr *myerr = (my_error_mgr*) cinfo->err;
-
- // Always display the message.
- (*cinfo->err->output_message) (cinfo);
-
- // Return control to the setjmp point
- longjmp(myerr->setjmp_buffer, 1);
-}
-
-METHODDEF(void)
-my_output_message(j_common_ptr cinfo) {
- char buf[JMSG_LENGTH_MAX];
- cinfo->err->format_message(cinfo, buf);
- dsyslog("skindesigner: libjpeg error: %s", buf);
-}
-
class cImageImporterJPG : public cImageImporter {
public:
cImageImporterJPG();
@@ -89,8 +64,9 @@ private:
FILE *infile;
};
-
-
+//
+// Image loader class
+//
class cImageLoader {
private:
cImageImporter *importer;