Changeset 3083 for libpipi/trunkTweet

Timestamp:

Oct 24, 2008, 2:03:15 PM (12 years ago)

Author:

Jean-Yves Lamoureux

Message:

• Added file extension detection to modular codec

Location:

libpipi/trunk/pipi/codec

Files:

• modular.c (modified) (2 diffs)
• modular/jpeg.c (modified) (6 diffs)

libpipi/trunk/pipi/codec/modular.c

@@ +1 @@
+/*
+ *  libpipi       Pathetic image processing interface library
+ *  Copyright (c) 2004-2008 Sam Hocevar <sam@zoy.org>
+ *                2008 Jean-Yves Lamoureux <jylam@lnxscene.org>
+ *                All Rights Reserved
+ *
+ *  $Id$
+ *
+ *  This library is free software. It comes without any warranty, to
+ *  the extent permitted by applicable law. You can redistribute it
+ *  and/or modify it under the terms of the Do What The Fuck You Want
+ *  To Public License, Version 2, as published by Sam Hocevar. See
+ *  http://sam.zoy.org/wtfpl/COPYING for more details.
+ */
+
+/*
+ * modular.c: hand-written codecs multiplexer
+ */
+
 #include "modular.h"
 
@@ -9 +28 @@
 int pipi_save_modular(pipi_image_t *img, const char *name)
 {
-    return pipi_save_jpeg(img, name);
+    if(!strncasecmp(&name[strlen(name) - 3], "jpg",  3) ||
+       !strncasecmp(&name[strlen(name) - 4], "jpeg", 4) )
+        return pipi_save_jpeg(img, name);
+    return -1;
 }

libpipi/trunk/pipi/codec/modular/jpeg.c

@@ -48 +48 @@
     if(!fp) goto end;
 
-
+    /* Set callbacks */
     cinfo.err = jpeg_std_error(&jerr);
     jerr.error_exit = error_msg;
@@ -55 +55 @@
     jerr.format_message = format_msg;
 
+    /* Initialize libjpeg */
     jpeg_create_decompress(&cinfo);
     cinfo.client_data = 0x0;
@@ -70 +71 @@
     }
 
+    /* One scanline */
     image = malloc(cinfo.output_width * cinfo.output_height * 4);
     if(!image) goto end;
@@ -75 +77 @@
     scanline = malloc(cinfo.output_width * 3);
 
-    /* Read scanlines, converting them to RGBA */
+
     for(i=0; i < cinfo.output_height; i++)
     {
@@ -134 +136 @@
     data = pixels->pixels;
 
-
     line = malloc(img->w * 3 * sizeof(unsigned char));
     if (!line)
@@ -175 +176 @@
             ptr++;
         }
-        /* write scanline */
         jbuf = (JSAMPROW *) (&line);
         jpeg_write_scanlines(&cinfo, jbuf, 1);