Pedro Côrte-Real pedrocr
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/src/common/database.c b/src/common/database.c | |
| index 80e2dad..4231f5d 100644 | |
| --- a/src/common/database.c | |
| +++ b/src/common/database.c | |
| @@ -20,6 +20,7 @@ | |
| #include "common/darktable.h" | |
| #include "common/debug.h" | |
| #include "common/database.h" | |
| +#include "common/imageio_rawspeed.h" | |
| #include "control/control.h" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| this is darktable 1.7.0+1393~g42cd9c6 reporting a segfault: | |
| #0 0x00007f44c561de9c in __libc_waitpid (pid=pid@entry=29819, stat_loc=stat_loc@entry=0x0, options=options@entry=0) at ../sysdeps/unix/sysv/linux/waitpid.c:31 | |
| #1 0x00007f44c58a6ac0 in _dt_sigsegv_handler (param=11) at /home/pedrocr/Projects/darktable/src/common/darktable.c:185 | |
| #2 <signal handler called> | |
| #3 dt_database_get (db=0x0) at /home/pedrocr/Projects/darktable/src/common/database.c:1252 | |
| #4 0x00007f44c58ab6ed in _upgrade_schema_step (version=version@entry=10, db=<optimized out>) at /home/pedrocr/Projects/darktable/src/common/database.c:759 | |
| #5 0x00007f44c58ad697 in _upgrade_schema (version=10, db=<optimized out>) at /home/pedrocr/Projects/darktable/src/common/database.c:802 | |
| #6 dt_database_init (alternative=alternative@entry=0x0) at /home/pedrocr/Projects/darktable/src/common/database.c:1140 | |
| #7 0x00007f44c58a8083 in dt_init (argc=6, argv=0x7ffce8a599c8, init_gui=init_gui@entry=1, L=L@entry=0x0) at /home/pedrocr/Projects/darktable/src/comm |
pedrocr
/ gist:bfb0c423fd8a71273cea
Created
June 13, 2015 11:50
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/src/external/rawspeed/RawSpeed/CrwDecoder.cpp b/src/external/rawspeed/RawSpeed/CrwDecoder.cpp | |
| index 567b420..ca0c7b1 100644 | |
| --- a/src/external/rawspeed/RawSpeed/CrwDecoder.cpp | |
| +++ b/src/external/rawspeed/RawSpeed/CrwDecoder.cpp | |
| @@ -218,7 +218,7 @@ void CrwDecoder::makeDecoder (int n, const uchar8 *source) | |
| mHuff[n] = NULL; | |
| } | |
| - ushort16* huff = (ushort16 *) _aligned_malloc((1 + (1 << max)* sizeof(ushort16)), 16); | |
| + ushort16* huff = (ushort16 *) _aligned_malloc((1 + (1 << max)) * sizeof(ushort16), 16); |
pedrocr
/ gist:cb938e7bcb354f6f935e
Last active
August 29, 2015 14:23
Darktable crashing on startup inside lua somewhere
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Core was generated by `/opt/darktable/bin/darktable --configdir conf/ --cachedir ./cache/ .'. | |
| Program terminated with signal SIGABRT, Aborted. | |
| #0 0x00007f300bad8cc9 in __GI_raise (sig=sig@entry=6) at ../nptl/sysdeps/unix/sysv/linux/raise.c:56 | |
| 56 ../nptl/sysdeps/unix/sysv/linux/raise.c: No such file or directory. | |
| (gdb) thread apply all bt | |
| Thread 8 (Thread 0x7f2ffb6ba700 (LWP 23602)): | |
| #0 pthread_cond_wait@@GLIBC_2.3.2 () at ../nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S:185 | |
| #1 0x00007f300c15ff9e in dt_control_work_res (ptr=<optimized out>) at /home/pedrocr/Projects/darktable/src/control/jobs.c:438 | |
| #2 0x00007f300be6f182 in start_thread (arg=0x7f2ffb6ba700) at pthread_create.c:312 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/src/external/rawspeed/RawSpeed/LJpegPlain.cpp b/src/external/rawspeed/RawSpeed/LJpegPlain.cpp | |
| index 1f630d7..bf24270 100644 | |
| --- a/src/external/rawspeed/RawSpeed/LJpegPlain.cpp | |
| +++ b/src/external/rawspeed/RawSpeed/LJpegPlain.cpp | |
| @@ -775,7 +775,7 @@ void LJpegPlain::decodeScanLeft4Comps() { | |
| if (mCanonDoubleHeight) { | |
| frame.h *= 2; | |
| - mRaw->dim = iPoint2D(frame.w * 2, frame.h); | |
| + mRaw->dim = iPoint2D(frame.w * 2, frame.h * 2); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| dt_view_load_module 186 : registering view lighttable, 0x2014c00 | |
| dt_lua_init_singleton 720 : registered 0x2014c00 | |
| dt_view_load_module 186 : registering view darkroom, 0x2014d28 | |
| dt_lua_init_singleton 720 : registered 0x2014d28 | |
| dt_view_load_module 186 : registering view tethering, 0x2014e50 | |
| dt_lua_init_singleton 720 : registered 0x2014e50 | |
| dt_view_load_module 186 : registering view slideshow, 0x2014f78 | |
| dt_lua_init_singleton 720 : registered 0x2014f78 | |
| dt_view_load_module 186 : registering view print, 0x20150a0 | |
| dt_lua_init_singleton 720 : registered 0x20150a0 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| $ rm -fr cache/ conf/ && ../../rundt | |
| [defaults] found a 64-bit system with 7894276 kb ram and 4 cores (0 atom based) | |
| dt_view_load_module 186 : registering view lighttable, 0xf93800 | |
| dt_view_load_module 186 : registering view darkroom, 0xf93928 | |
| dt_view_load_module 186 : registering view tethering, 0xf93a50 | |
| dt_view_load_module 186 : registering view slideshow, 0xf93b78 | |
| dt_view_load_module 186 : registering view print, 0xf93ca0 | |
| TBSL view enter and view leave | |
| dt_lua_init_view 86 : signal connected | |
| dt_view_manager_switch 419 : view changed (nil) -> 0xf93800 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| dt_view_load_module 186 : registering view lighttable, 0x14a0850 | |
| dt_lua_init_singleton 720 : registered 0x14a0850 | |
| dt_view_load_module 186 : registering view darkroom, 0x14a0978 | |
| dt_lua_init_singleton 720 : registered 0x14a0978 | |
| dt_view_load_module 186 : registering view tethering, 0x14a0aa0 | |
| dt_lua_init_singleton 720 : registered 0x14a0aa0 | |
| dt_view_load_module 186 : registering view slideshow, 0x14a0bc8 | |
| dt_lua_init_singleton 720 : registered 0x14a0bc8 | |
| dt_view_load_module 186 : registering view print, 0x14a0cf0 | |
| dt_lua_init_singleton 720 : registered 0x14a0cf0 |
pedrocr
/ gist:8be183e62563d0eec895
Created
July 4, 2015 09:02
darktable crashing on print stuff on startup
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| this is darktable 1.7.0+1677~ge238cce reporting a segfault: | |
| #0 0x00007fa037396ee9 in __libc_waitpid (pid=pid@entry=6741, stat_loc=stat_loc@entry=0x0, options=options@entry=0) at ../sysdeps/unix/sysv/linux/waitpid.c:40 | |
| #1 0x00007fa037620af0 in _dt_sigsegv_handler (param=11) at /home/pedrocr/Projects/darktable/src/common/darktable.c:185 | |
| #2 <signal handler called> | |
| #3 __GI___libc_free (mem=0xcd025a) at malloc.c:2929 | |
| #4 0x00007f9ff488e95a in gui_init (self=<optimized out>) at /home/pedrocr/Projects/darktable/src/libs/print_settings.c:1037 | |
| #5 0x00007fa037724d6d in dt_lib_load_modules () at /home/pedrocr/Projects/darktable/src/libs/lib.c:722 | |
| #6 0x00007fa03772583f in dt_lib_init (lib=<optimized out>) at /home/pedrocr/Projects/darktable/src/libs/lib.c:1014 | |
| #7 0x00007fa03762326c in dt_init (argc=1, argv=0x7ffc8c463208, init_gui=init_gui@entry=1, L=L@entry=0x0) at /home/pedrocr/Projects/darktable/src/common/darktable.c:888 |
pedrocr
/ gist:887cdd089bc262a3b2f0
Created
July 12, 2015 10:51
Current diff between darktable's rawspeed and upstream
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff -ur RawSpeed/Camera.cpp ../darktable/src/external/rawspeed/RawSpeed/Camera.cpp | |
| --- RawSpeed/Camera.cpp 2015-06-24 12:46:49.670692111 +0100 | |
| +++ ../darktable/src/external/rawspeed/RawSpeed/Camera.cpp 2015-07-12 11:49:21.758328129 +0100 | |
| @@ -195,7 +195,7 @@ | |
| } | |
| const char* key = cur.first_child().value(); | |
| if ((int)strlen(key) != cfa.size.x) { | |
| - ThrowCME("Invalid number of colors in definition for row %d in camera %s %s. Expected %d, found %d.", y, make.c_str(), model.c_str(), cfa.size.x, strlen(key)); | |
| + ThrowCME("Invalid number of colors in definition for row %d in camera %s %s. Expected %d, found %zu.", y, make.c_str(), model.c_str(), cfa.size.x, strlen(key)); | |
| } |