X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fdcraw.c;h=4d0e3826f6b8e8a58eb651c141f2b8b6f03cd128;hp=89632b686b55a2464adf91a54123e4d44791050e;hb=21c2e6b36d6a96c2f662a89459d607b5a387f4eb;hpb=5a1b2bb96f2bd6b7ef4f8031763683726c02219d diff --git a/cinelerra-5.1/cinelerra/dcraw.c b/cinelerra-5.1/cinelerra/dcraw.c index 89632b68..4d0e3826 100644 --- a/cinelerra-5.1/cinelerra/dcraw.c +++ b/cinelerra-5.1/cinelerra/dcraw.c @@ -5604,7 +5604,7 @@ void CLASS apply_tiff() } if (!dng_version) if ( (tiff_samples == 3 && tiff_ifd[raw].bytes && - tiff_bps != 14 && tiff_bps != 2048 && + tiff_bps != 14 && tiff_bps != 2048 && tiff_compress != 32769 && tiff_compress != 32770) || (tiff_bps == 8 && !strstr(make,"KODAK") && !strstr(make,"Kodak") && !strstr(model2,"DEBUG RAW"))) @@ -8750,7 +8750,7 @@ notraw: // CINELERRA - if (flip & 4) + if (flip & 4) sprintf(dcraw_info, "%d %d", height, width); else sprintf(dcraw_info, "%d %d", width, height); @@ -8916,7 +8916,7 @@ void CLASS convert_to_rgb() // CINELERRA -// Export color matrix to Cinelerra. +// Export color matrix to Cinelerra. // It can't be applied before interpolation. k = 0; for(i = 0; i < 3; i++) @@ -9207,13 +9207,13 @@ void CLASS write_cinelerra (FILE *ofp) int row, col; float *output; - for (row = 0; row < height; row++) + for (row = 0; row < height; row++) { output = dcraw_data[row]; if(document_mode) { - for (col = 0; col < width; col++) + for (col = 0; col < width; col++) { ushort *pixel = image[row * width + col]; @@ -9226,7 +9226,7 @@ void CLASS write_cinelerra (FILE *ofp) } else { - for (col = 0; col < width; col++) + for (col = 0; col < width; col++) { ushort *pixel = image[row * width + col]; @@ -9237,7 +9237,7 @@ void CLASS write_cinelerra (FILE *ofp) if(dcraw_alpha) *output++ = 1.0; } } - } + } } @@ -9455,15 +9455,15 @@ int CLASS dcraw_main (int argc, const char **argv) goto next; } write_fun = &CLASS write_ppm_tiff; - - - + + + // CINELERRA write_fun = write_cinelerra; - - + + if (thumbnail_only) { if ((status = !thumb_offset)) { fprintf (stderr,_("%s has no thumbnail.\n"), ifname);