Merge branch 'dev' into floatdng

2018-11-18 11:38:09 +01:00
parent 6877360913 b090fd7d2f
commit 074560def0
169 changed files with 6988 additions and 2749 deletions
--- a/rtengine/dcraw.h
+++ b/rtengine/dcraw.h
@@ -292,6 +292,7 @@ void ljpeg_idct (struct jhead *jh);
 void canon_sraw_load_raw();
 void adobe_copy_pixel (unsigned row, unsigned col, ushort **rp);
 void lossless_dng_load_raw();
+void lossless_dnglj92_load_raw();
 void packed_dng_load_raw();
 void deflate_dng_load_raw();
 void init_fuji_compr(struct fuji_compressed_params* info);