aferrero2707 / PhotoFlow

A fully non-destructive photo retouching program providing a complete layer-based workflow including RAW image development.
http://aferrero2707.github.io/PhotoFlow
GNU General Public License v3.0
309 stars 36 forks source link

G'MIC 1.6.9, latest patches and problems #77

Closed salvadhor closed 8 years ago

salvadhor commented 8 years ago

Latest set of patches breaks compile on Ubuntu (launchpad, photoflow-git):

[ 70%] Building CXX object src/CMakeFiles/pfbase.dir/vips/gmic/gmic/src/gmic.cpp.o cd /«BUILDDIR»/photoflow-git-2.4+git20160221/obj-x86_64-linux-gnu/src && /usr/bin/x86_64-linux-gnu-g++ -DPF_HAS_LENSFUN -O3 -ffast-math -ftree-vectorize -DNDEBUG -std=gnu++11 -Wno-error=narrowing -Dgmic_build -Dcimg_use_vt100 -Dgmic_is_parallel -Dcimg_use_fftw3 -Dcimg_use_tiff -Dcimg_use_zlib -Dcimg_display=0 -fno-ipa-sra -fpermissive -I/«BUILDDIR»/photoflow-git-2.4+git20160221/src/dt -DLIBRAW_NODLL -DINSTALL_PREFIX='"/usr"' -DLOCALEDIR="/usr/share/locale" -DBUNDLED_LENSFUN=1 -DGTKMM_2 -Wno-unused-parameter -fPIC -I/usr/include/gtkmm-2.4 -I/usr/lib/x86_64-linux-gnu/gtkmm-2.4/include -I/usr/include/atkmm-1.6 -I/usr/include/giomm-2.4 -I/usr/lib/x86_64-linux-gnu/giomm-2.4/include -I/usr/include/pangomm-1.4 -I/usr/lib/x86_64-linux-gnu/pangomm-1.4/include -I/usr/include/gtk-2.0 -I/usr/include/gtk-unix-print-2.0 -I/usr/include/gdkmm-2.4 -I/usr/lib/x86_64-linux-gnu/gdkmm-2.4/include -I/usr/include/atk-1.0 -I/usr/include/glibmm-2.4 -I/usr/lib/x86_64-linux-gnu/glibmm-2.4/include -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I/usr/include/sigc++-2.0 -I/usr/lib/x86_64-linux-gnu/sigc++-2.0/include -I/usr/include/cairomm-1.0 -I/usr/lib/x86_64-linux-gnu/cairomm-1.0/include -I/usr/include/pango-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12 -I/usr/lib/x86_64-linux-gnu/gtk-2.0/include -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/harfbuzz -I/«BUILDDIR»/photoflow-git-2.4+git20160221/src/external -I/«BUILDDIR»/photoflow-git-2.4+git20160221/src/external/LibRaw -I/usr/include/OpenEXR -I/usr/include/libxml2 -I/usr/include/libexif -I/usr/include/orc-0.4 -I/usr/include/libgsf-1 -I/usr/include/ImageMagick -I/usr/include/openslide -I/usr/include/x86_64-linux-gnu -I/«BUILDDIR»/photoflow-git-2.4+git20160221/obj-x86_64-linux-gnu/include -o CMakeFiles/pfbase.dir/vips/gmic/gmic/src/gmic.cpp.o -c /«BUILDDIR»/photoflow-git-2.4+git20160221/src/vips/gmic/gmic/src/gmic.cpp /«BUILDDIR»/photoflow-git-2.4+git20160221/src/vips/gmic/gmic/src/gmic.cpp: In member function 'gmic& gmic::_run(const cimg_library::CImgList&, unsigned int&, cimg_library::CImgList&, cimg_library::CImgList&, cimg_library::CImgList&, cimglibrary::CImgList&, const unsigned int, bool, const char, const cimglibrary::CImg)': /«BUILDDIR»/photoflow-git-2.4+git20160221/src/vips/gmic/gmic/src/gmic.cpp:9281:17: error: 'wait_mode' was not declared in this scope if (wait_mode) { ^ In file included from /«BUILDDIR»/photoflow-git-2.4+git20160221/src/vips/gmic/gmic/src/gmic.h:171:0, from /«BUILDDIR»/photoflow-git-2.4+git20160221/src/vips/gmic/gmic/src/gmic.cpp:1912: /«BUILDDIR»/photoflow-git-2.4+git20160221/src/vips/gmic/gmic/src/gmic.cpp:9282:25: error: '_threads_data' was not declared in this scope cimg_forY(_threads_data,l) if (_threads_data[l].is_thread_running) { ^ /«BUILDDIR»/photoflow-git-2.4+git20160221/src/vips/gmic/gmic/src/./CImg.h:712:52: note: in definition of macro 'cimg_for1'

define cimg_for1(bound,i) for (int i = 0; i<(int)(bound); ++i)

                                                ^

/«BUILDDIR»/photoflow-git-2.4+git20160221/src/vips/gmic/gmic/src/gmic.cpp:9282:15: note: in expansion of macro 'cimg_forY' cimg_forY(_threads_data,l) if (_threads_data[l].is_thread_running) {

Joermungand commented 8 years ago

Same here on 64-bit Arch.

aferrero2707 commented 8 years ago

I will look into this issue later today, and let you know.

Thanks!

aferrero2707 commented 8 years ago

The issue should be fixed in stable branch.

Joermungand commented 8 years ago

Affirmative! It builds. Thanks.

On 22/02/16 16:21, aferrero2707 wrote:

The issue should be fixed in stable branch.

— Reply to this email directly or view it on GitHub https://github.com/aferrero2707/PhotoFlow/issues/77#issuecomment-187199215.

salvadhor commented 8 years ago

Yes, everything works now.