Bug 482119 - Remove unused write_icc_profile. r=joe
authorZeev Tarantov <zeev.tarantov@gmail.com>
Sat, 14 Nov 2009 19:48:55 +0100
changeset 34865 958f1b94f0ec54ec326db70118b4473af091d1b7
parent 34864 43dfa77e3d4cd5c18a0390b5b5f1258226a2badf
child 34866 de440bae5f2691b3e2a7748824ce2cd6c33a55c8
push id10311
push userdgottwald@mozilla.com
push dateSat, 14 Nov 2009 18:49:34 +0000
treeherdermozilla-central@958f1b94f0ec [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjoe
bugs482119
milestone1.9.3a1pre
Bug 482119 - Remove unused write_icc_profile. r=joe
modules/libpr0n/decoders/jpeg/iccjpeg.c
modules/libpr0n/decoders/jpeg/iccjpeg.h
--- a/modules/libpr0n/decoders/jpeg/iccjpeg.c
+++ b/modules/libpr0n/decoders/jpeg/iccjpeg.c
@@ -34,81 +34,16 @@
  * rather than assuming that the APP2 markers appear in the correct sequence.
  */
 
 #define ICC_MARKER  (JPEG_APP0 + 2)	/* JPEG marker code for ICC */
 #define ICC_OVERHEAD_LEN  14		/* size of non-profile data in APP2 */
 #define MAX_BYTES_IN_MARKER  65533	/* maximum data len of a JPEG marker */
 #define MAX_DATA_BYTES_IN_MARKER  (MAX_BYTES_IN_MARKER - ICC_OVERHEAD_LEN)
 
-
-/*
- * This routine writes the given ICC profile data into a JPEG file.
- * It *must* be called AFTER calling jpeg_start_compress() and BEFORE
- * the first call to jpeg_write_scanlines().
- * (This ordering ensures that the APP2 marker(s) will appear after the
- * SOI and JFIF or Adobe markers, but before all else.)
- */
-
-void
-write_icc_profile (j_compress_ptr cinfo,
-		   const JOCTET *icc_data_ptr,
-		   unsigned int icc_data_len)
-{
-  unsigned int num_markers;	/* total number of markers we'll write */
-  int cur_marker = 1;		/* per spec, counting starts at 1 */
-  unsigned int length;		/* number of bytes to write in this marker */
-
-  /* Calculate the number of markers we'll need, rounding up of course */
-  num_markers = icc_data_len / MAX_DATA_BYTES_IN_MARKER;
-  if (num_markers * MAX_DATA_BYTES_IN_MARKER != icc_data_len)
-    num_markers++;
-
-  while (icc_data_len > 0) {
-    /* length of profile to put in this marker */
-    length = icc_data_len;
-    if (length > MAX_DATA_BYTES_IN_MARKER)
-      length = MAX_DATA_BYTES_IN_MARKER;
-    icc_data_len -= length;
-
-    /* Write the JPEG marker header (APP2 code and marker length) */
-    jpeg_write_m_header(cinfo, ICC_MARKER,
-			(unsigned int) (length + ICC_OVERHEAD_LEN));
-
-    /* Write the marker identifying string "ICC_PROFILE" (null-terminated).
-     * We code it in this less-than-transparent way so that the code works
-     * even if the local character set is not ASCII.
-     */
-    jpeg_write_m_byte(cinfo, 0x49);
-    jpeg_write_m_byte(cinfo, 0x43);
-    jpeg_write_m_byte(cinfo, 0x43);
-    jpeg_write_m_byte(cinfo, 0x5F);
-    jpeg_write_m_byte(cinfo, 0x50);
-    jpeg_write_m_byte(cinfo, 0x52);
-    jpeg_write_m_byte(cinfo, 0x4F);
-    jpeg_write_m_byte(cinfo, 0x46);
-    jpeg_write_m_byte(cinfo, 0x49);
-    jpeg_write_m_byte(cinfo, 0x4C);
-    jpeg_write_m_byte(cinfo, 0x45);
-    jpeg_write_m_byte(cinfo, 0x0);
-
-    /* Add the sequencing info */
-    jpeg_write_m_byte(cinfo, cur_marker);
-    jpeg_write_m_byte(cinfo, (int) num_markers);
-
-    /* Add the profile data */
-    while (length--) {
-      jpeg_write_m_byte(cinfo, *icc_data_ptr);
-      icc_data_ptr++;
-    }
-    cur_marker++;
-  }
-}
-
-
 /*
  * Prepare for reading an ICC profile
  */
 
 void
 setup_read_icc_profile (j_decompress_ptr cinfo)
 {
   /* Tell the library to keep any APP2 data it may find */
--- a/modules/libpr0n/decoders/jpeg/iccjpeg.h
+++ b/modules/libpr0n/decoders/jpeg/iccjpeg.h
@@ -14,30 +14,16 @@
  * NOTE: this code would need surgery to work on 16-bit-int machines
  * with ICC profiles exceeding 64K bytes in size.  See iccprofile.c
  * for details.
  */
 
 #include <stdio.h>		/* needed to define "FILE", "NULL" */
 #include "jpeglib.h"
 
-
-/*
- * This routine writes the given ICC profile data into a JPEG file.
- * It *must* be called AFTER calling jpeg_start_compress() and BEFORE
- * the first call to jpeg_write_scanlines().
- * (This ordering ensures that the APP2 marker(s) will appear after the
- * SOI and JFIF or Adobe markers, but before all else.)
- */
-
-extern void write_icc_profile JPP((j_compress_ptr cinfo,
-				   const JOCTET *icc_data_ptr,
-				   unsigned int icc_data_len));
-
-
 /*
  * Reading a JPEG file that may contain an ICC profile requires two steps:
  *
  * 1. After jpeg_create_decompress() but before jpeg_read_header(),
  *    call setup_read_icc_profile().  This routine tells the IJG library
  *    to save in memory any APP2 markers it may find in the file.
  *
  * 2. After jpeg_read_header(), call read_icc_profile() to find out