liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Merged master into gtk3, fixed three conflicts."

Browse Source 
This reverts commit c857bba95e.
This commit is contained in:
Beep6581
2016-06-09 23:24:55 +02:00
parent bd1a7fc4a7
commit 3da7d84ba9
50 changed files with 5937 additions and 6037 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
rtengine/dcraw.h
View File

@@ -127,7 +127,6 @@ protected:
struct tiff_ifd {
int width, height, bps, comp, phint, offset, flip, samples, bytes;
int tile_width, tile_length, sample_format, predictor;
float shutter;
} tiff_ifd[10];
struct ph1 {
@@ -140,8 +139,8 @@ protected:
} hbd;
struct jhead {
int algo, bits, high, wide, clrs, sraw, psv, restart, vpred[6];
ushort quant[64], idct[64], *huff[20], *free[20], *row;
int bits, high, wide, clrs, sraw, psv, restart, vpred[6];
ushort *huff[6], *free[4], *row;
};
struct tiff_tag {
@@ -218,8 +217,6 @@ void ljpeg_end (struct jhead *jh);
int ljpeg_diff (ushort *huff);
ushort * ljpeg_row (int jrow, struct jhead *jh);
void lossless_jpeg_load_raw();
void ljpeg_idct (struct jhead *jh);
void canon_sraw_load_raw();
void adobe_copy_pixel (unsigned row, unsigned col, ushort **rp);