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

lossless_dnglj92_load_raw(), don't use malloc/free

Browse Source
This commit is contained in:
heckflosse 2018-11-14 14:42:25 +01:00
parent b0bc0c7add
commit 2973247948
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
rtengine/dcraw.cc
View File

@ -1147,11 +1147,11 @@ void CLASS lossless_dnglj92_load_raw()
} else { } else {
dataOffset[0] = ifp->pos; dataOffset[0] = ifp->pos;
} }
uint8_t *data = (uint8_t*)malloc(ifp->size); const int data_length = ifp->size;
const std::unique_ptr<uint8_t[]> data(new uint8_t[data_length]);
fseek(ifp, 0, SEEK_SET); fseek(ifp, 0, SEEK_SET);
// read whole file // read whole file
int data_length = ifp->size; fread(data.get(), 1, data_length, ifp);
fread(data, 1, data_length, ifp);
lj92 lj; lj92 lj;
int newwidth, newheight, newbps; int newwidth, newheight, newbps;
lj92_open(&lj, &data[dataOffset[0]], data_length, &newwidth, &newheight, &newbps); lj92_open(&lj, &data[dataOffset[0]], data_length, &newwidth, &newheight, &newbps);
@ -1159,7 +1159,6 @@ void CLASS lossless_dnglj92_load_raw()
if (newwidth * newheight * tileCount != raw_width * raw_height) { if (newwidth * newheight * tileCount != raw_width * raw_height) {
// not a lj92 file // not a lj92 file
fseek(ifp, save, SEEK_SET); fseek(ifp, save, SEEK_SET);
free(data);
lossless_dng_load_raw(); lossless_dng_load_raw();
return; return;
} }
@ -1173,17 +1172,15 @@ void CLASS lossless_dnglj92_load_raw()
int newwidth, newheight, newbps; int newwidth, newheight, newbps;
lj92_open(&lj, &data[dataOffset[t]], data_length, &newwidth, &newheight, &newbps); lj92_open(&lj, &data[dataOffset[t]], data_length, &newwidth, &newheight, &newbps);
uint16_t *target = (uint16_t*)malloc(newwidth * newheight * sizeof *target); const std::unique_ptr<uint16_t[]> target(new uint16_t[newwidth * newheight]);
lj92_decode(lj, target, tile_width, 0, lincurve, 0x1000); lj92_decode(lj, target.get(), tile_width, 0, lincurve, 0x1000);
for (int y = 0; y < height; ++y) { for (int y = 0; y < height; ++y) {
for(int x = 0; x < tile_width; ++x) { for(int x = 0; x < tile_width; ++x) {
RAW(y, x + tcol) = target[y * tile_width + x]; RAW(y, x + tcol) = target[y * tile_width + x];
} }
} }
lj92_close(lj); lj92_close(lj);
free(target);
} }
free(data);
} }
void CLASS lossless_dng_load_raw() void CLASS lossless_dng_load_raw()