projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cleanup of hv6 merge, add webm rendering
[goodguy/history.git]
/
cinelerra-5.1
/
cinelerra
/
dcraw.c
diff --git
a/cinelerra-5.1/cinelerra/dcraw.c
b/cinelerra-5.1/cinelerra/dcraw.c
index 9543ae84f31162d1167c99bbeaad9c0c5672a9d6..4d0e3826f6b8e8a58eb651c141f2b8b6f03cd128 100644
(file)
--- a/
cinelerra-5.1/cinelerra/dcraw.c
+++ b/
cinelerra-5.1/cinelerra/dcraw.c
@@
-968,12
+968,13
@@
void CLASS canon_sraw_load_raw()
ip = (short (*)[4]) image;
rp = ip[0];
for (row=0; row < height; row++, ip+=width) {
ip = (short (*)[4]) image;
rp = ip[0];
for (row=0; row < height; row++, ip+=width) {
- if (row & (jh.sraw >> 1))
+ if (row & (jh.sraw >> 1))
{
for (col=0; col < width; col+=2)
for (c=1; c < 3; c++)
if (row == height-1)
ip[col][c] = ip[col-width][c];
else ip[col][c] = (ip[col-width][c] + ip[col+width][c] + 1) >> 1;
for (col=0; col < width; col+=2)
for (c=1; c < 3; c++)
if (row == height-1)
ip[col][c] = ip[col-width][c];
else ip[col][c] = (ip[col-width][c] + ip[col+width][c] + 1) >> 1;
+ }
for (col=1; col < width; col+=2)
for (c=1; c < 3; c++)
if (col == width-1)
for (col=1; col < width; col+=2)
for (c=1; c < 3; c++)
if (col == width-1)
@@
-5603,7
+5604,7
@@
void CLASS apply_tiff()
}
if (!dng_version)
if ( (tiff_samples == 3 && tiff_ifd[raw].bytes &&
}
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")))
tiff_compress != 32769 && tiff_compress != 32770)
|| (tiff_bps == 8 && !strstr(make,"KODAK") && !strstr(make,"Kodak") &&
!strstr(model2,"DEBUG RAW")))
@@
-8749,7
+8750,7
@@
notraw:
// CINELERRA
// CINELERRA
- if (flip & 4)
+ if (flip & 4)
sprintf(dcraw_info, "%d %d", height, width);
else
sprintf(dcraw_info, "%d %d", width, height);
sprintf(dcraw_info, "%d %d", height, width);
else
sprintf(dcraw_info, "%d %d", width, height);
@@
-8915,7
+8916,7
@@
void CLASS convert_to_rgb()
// CINELERRA
// 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++)
// It can't be applied before interpolation.
k = 0;
for(i = 0; i < 3; i++)
@@
-9206,13
+9207,13
@@
void CLASS write_cinelerra (FILE *ofp)
int row, col;
float *output;
int row, col;
float *output;
- for (row = 0; row < height; row++)
+ for (row = 0; row < height; row++)
{
output = dcraw_data[row];
if(document_mode)
{
{
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];
{
ushort *pixel = image[row * width + col];
@@
-9225,7
+9226,7
@@
void CLASS write_cinelerra (FILE *ofp)
}
else
{
}
else
{
- for (col = 0; col < width; col++)
+ for (col = 0; col < width; col++)
{
ushort *pixel = image[row * width + col];
{
ushort *pixel = image[row * width + col];
@@
-9236,7
+9237,7
@@
void CLASS write_cinelerra (FILE *ofp)
if(dcraw_alpha) *output++ = 1.0;
}
}
if(dcraw_alpha) *output++ = 1.0;
}
}
- }
+ }
}
}
@@
-9454,15
+9455,15
@@
int CLASS dcraw_main (int argc, const char **argv)
goto next;
}
write_fun = &CLASS write_ppm_tiff;
goto next;
}
write_fun = &CLASS write_ppm_tiff;
-
-
-
+
+
+
// CINELERRA
write_fun = write_cinelerra;
// CINELERRA
write_fun = write_cinelerra;
-
-
+
+
if (thumbnail_only) {
if ((status = !thumb_offset)) {
fprintf (stderr,_("%s has no thumbnail.\n"), ifname);
if (thumbnail_only) {
if ((status = !thumb_offset)) {
fprintf (stderr,_("%s has no thumbnail.\n"), ifname);