remove support for SANE_FRAME_JPEG, add other frame types but commented out

ChangeLog

@@ -1,8 +1,12 @@
-2007-12-26  Alessandro Zummo <a.zummo@towertech.it>
-	* backend/epson2.c, added network scanner autodiscovery
+2007-12-29  m. allan noah <kitno455 a t gmail d o t com>
+	* include/sane/sane.h, frontend/scanimage.c, backend/fujitsu.[ch]:
+	  commented/removed/deactivated all new SANE_FRAME code
 
 2007-12-26  Alessandro Zummo <a.zummo@towertech.it>
-	* sanei/sanei_udp.c, added udp support functions
+	* backend/epson2.c: added network scanner autodiscovery
+
+2007-12-26  Alessandro Zummo <a.zummo@towertech.it>
+	* sanei/sanei_udp.c: added udp support functions
 
 2007-12-24  Julien Blache <jb@jblache.org>
 	* configure.in, configure: Do not build plustek_pp on Hurd. Patch

backend/fujitsu.c

@@ -270,6 +270,8 @@
       V 1.0.53 2007-11-18, MAN
          - add S510 usb id
 	 - OPT_NUM_OPTS type is SANE_TYPE_INT (jblache)
+      V 1.0.54 2007-12-29, MAN
+	 - disable SANE_FRAME_JPEG support until SANE 1.1.0
 
    SANE FLOW DIAGRAM
 
@@ -2162,9 +2164,9 @@ sane_get_option_descriptor (SANE_Handle handle, SANE_Int option)
     opt->constraint.string_list = s->compress_list;
     opt->size = maxStringSize (opt->constraint.string_list);
 
-    if (i > 1)
+    /*if (i > 1)
       opt->cap = SANE_CAP_SOFT_SELECT | SANE_CAP_SOFT_DETECT;
-    else
+    else*/
       opt->cap = SANE_CAP_INACTIVE;
   }
 

backend/fujitsu.h

@@ -6,6 +6,9 @@
  * Please see opening comment in fujitsu.c
  */
 
+/* until SANE 1.1.0 is released, we wont have this frame type */
+#define SANE_FRAME_JPEG 11
+
 /* ------------------------------------------------------------------------- 
  * This option list has to contain all options for all scanners supported by
  * this driver. If a certain scanner cannot handle a certain option, there's

frontend/scanimage.c

@@ -1141,7 +1141,7 @@ scan_it (void)
   SANE_Status status;
   Image image = { 0, 0, 0, 0, 0, 0 };
   static const char *format_name[] = {
-    "gray", "RGB", "red", "green", "blue", "JPEG"
+    "gray", "RGB", "red", "green", "blue"
   };
   SANE_Word total_bytes = 0, expected_bytes;
   SANE_Int hang_over = -1;
@@ -1186,7 +1186,7 @@ scan_it (void)
 	    }
 
 	  fprintf (stderr, "%s: acquiring %s frame\n", prog_name,
-	   parm.format <= SANE_FRAME_JPEG ? format_name[parm.format]:"Unknown");
+	   parm.format <= SANE_FRAME_BLUE ? format_name[parm.format]:"Unknown");
 	}
 
       if (first_frame)
@@ -1505,7 +1505,7 @@ test_it (void)
 	     prog_name, parm.pixels_per_line,
 	     8 * parm.bytes_per_line / parm.pixels_per_line);
   fprintf (stderr, "%s: acquiring %s frame, %d bits/sample\n", prog_name,
-	   parm.format <= SANE_FRAME_JPEG ? format_name[parm.format]:"Unknown",
+	   parm.format <= SANE_FRAME_BLUE ? format_name[parm.format]:"Unknown",
            parm.depth);
 
   image.data = malloc (parm.bytes_per_line * 2);

include/sane/sane.h

@@ -165,12 +165,27 @@ SANE_Action;
 
 typedef enum
   {
-    SANE_FRAME_GRAY,		/* band covering human visual range */
-    SANE_FRAME_RGB,		/* pixel-interleaved red/green/blue bands */
-    SANE_FRAME_RED,		/* red band only */
-    SANE_FRAME_GREEN,		/* green band only */
-    SANE_FRAME_BLUE,		/* blue band only */
-    SANE_FRAME_JPEG		/* complete baseline JPEG file */
+    SANE_FRAME_GRAY,	/* band covering human visual range */
+    SANE_FRAME_RGB,	/* pixel-interleaved red/green/blue bands */
+    SANE_FRAME_RED,	/* red band only */
+    SANE_FRAME_GREEN,   /* green band only */
+    SANE_FRAME_BLUE     /* blue band only */
+
+    /* push remaining types down to match existing backends */
+    /* these frame types should not be used by default, */
+    /* as most front-ends will not understand them */
+    /* these will be enabled in SANE 1.1.0 */
+#if 0
+    SANE_FRAME_TEXT=10, /* for various textual/xml data */
+    SANE_FRAME_JPEG,    /* complete baseline JPEG file */
+    SANE_FRAME_G31D,    /* CCITT Group 3 1-D Compressed file */
+    SANE_FRAME_G32D,    /* CCITT Group 3 2-D Compressed file */
+    SANE_FRAME_G42D,    /* CCITT Group 4 2-D Compressed file */
+
+    SANE_FRAME_IR       /* bare infrared channel */
+    SANE_FRAME_RGBI,    /* red+green+blue+infrared */
+    SANE_FRAME_GRAYI    /* gray+infrared */
+#endif
   }
 SANE_Frame;