Merge from default. Hope I did it right...

2012-03-08 20:27:30 -06:00
parent 380728e1f0
commit f47b4b5bb0
262 changed files with 41736 additions and 37104 deletions
--- a/rtengine/iccjpeg.cc
+++ b/rtengine/iccjpeg.cc
@@ -216,9 +216,6 @@ read_icc_profile (j_decompress_ptr cinfo,
    total_length += data_length[seq_no];
  }

-  if (total_length <= 0)
-    return FALSE;		/* found only empty markers? */
-
  /* Allocate space for assembled data */
  icc_data = (JOCTET *) malloc(total_length * sizeof(JOCTET));
  if (icc_data == NULL)