diff options
Diffstat (limited to 'cad/meshlab/files')
| -rw-r--r-- | cad/meshlab/files/patch-meshlab__full.pro | 13 | ||||
| -rw-r--r-- | cad/meshlab/files/patch-meshlabplugins-filter_photosynth-downloader.cpp | 17 |
2 files changed, 30 insertions, 0 deletions
diff --git a/cad/meshlab/files/patch-meshlab__full.pro b/cad/meshlab/files/patch-meshlab__full.pro new file mode 100644 index 000000000000..f58150ba34fb --- /dev/null +++ b/cad/meshlab/files/patch-meshlab__full.pro @@ -0,0 +1,13 @@ +Make external libraries part of the default build. They are currently built +before the rest, as qmake will recurse into each subdirectory in order. +--- meshlab_full.pro.bak 2015-11-21 16:25:23.812658000 +0100 ++++ meshlab_full.pro 2015-11-21 16:25:32.892417000 +0100 +@@ -1,7 +1,7 @@ + #config += debug_and_release + TEMPLATE = subdirs + CONFIG += ordered +-SUBDIRS = common \ ++SUBDIRS = external common \ + meshlab \ + meshlabserver \ + # IO plugins diff --git a/cad/meshlab/files/patch-meshlabplugins-filter_photosynth-downloader.cpp b/cad/meshlab/files/patch-meshlabplugins-filter_photosynth-downloader.cpp new file mode 100644 index 000000000000..e57927cf60c4 --- /dev/null +++ b/cad/meshlab/files/patch-meshlabplugins-filter_photosynth-downloader.cpp @@ -0,0 +1,17 @@ +Prevents the following build error: + +downloader.cpp:686:23: error: non-constant-expression cannot be narrowed from type 'unsigned char' to 'char' in initializer list [-Wc++11-narrowing] + char reversed[] = { bytes[3],bytes[2],bytes[1],bytes[0] }; + ^~~~~~~~ +downloader.cpp:686:23: note: insert an explicit cast to silence this issue +--- meshlabplugins/filter_photosynth/downloader.cpp.orig 2013-05-22 15:09:13 UTC ++++ meshlabplugins/filter_photosynth/downloader.cpp +@@ -683,7 +683,7 @@ + if(error) + return -1; + } +- char reversed[] = { bytes[3],bytes[2],bytes[1],bytes[0] }; ++ unsigned char reversed[] = { bytes[3],bytes[2],bytes[1],bytes[0] }; + + float *f = (float *)(& reversed[0]); + return*f; |