dakcarto

diff --git a/Code/IO/otbDefaultConvertPixelTraits.h b/Code/IO/otbDefaultConvertPixelTraits.h
index eb0b0b4..92a1441 100644
--- a/Code/IO/otbDefaultConvertPixelTraits.h
+++ b/Code/IO/otbDefaultConvertPixelTraits.h
@@ -18,6 +18,8 @@
 #ifndef __otbDefaultConvertPixelTraits_h
 #define __otbDefaultConvertPixelTraits_h
 
+#include <vnl/vnl_math.h>
+

dakcarto

$ pdftoppm --help
pdftoppm version 0.24.5
Copyright 2005-2013 The Poppler Developers - http://poppler.freedesktop.org
Copyright 1996-2011 Glyph & Cog, LLC
Usage: pdftoppm [options] [PDF-file [PPM-file-prefix]]
  -f <int>                 : first page to print
  -l <int>                 : last page to print
  -o                       : print only odd pages
  -e                       : print only even pages
  -singlefile              : write only the first page and do not add digits

dakcarto

diff --git a/src/core/pal/layer.cpp b/src/core/pal/layer.cpp
index 28d0041..c0fec47 100644
--- a/src/core/pal/layer.cpp
+++ b/src/core/pal/layer.cpp
@@ -60,7 +60,7 @@ namespace pal
 
   Layer::Layer( const char *lyrName, double min_scale, double max_scale, Arrangement arrangement, Units label_unit, double defaultPriority, bool obstacle, bool active, bool toLabel, Pal *pal, bool displayAll )
       :  pal( pal ), obstacle( obstacle ), active( active ),
-      toLabel( toLabel ), displayAll( displayAll ), label_unit( label_unit ),
+      toLabel( toLabel ), displayAll( displayAll ), ignoreInvalidGeometries( true ), label_unit( label_unit ),

dakcarto

$ brew doctor
Warning: Your Cellar and TEMP directories are on different volumes.
OS X won't move relative symlinks across volumes unless the target file already
exists. Brews known to be affected by this are Git and Narwhal.

You should set the "HOMEBREW_TEMP" environmental variable to a suitable
directory on the same volume as your Cellar.

Warning: A newer Command Line Tools release is available
Update them from Software Update in the App Store.

dakcarto

From 122f6cc11888635a5a5e42583c28f0f79c23bde0 Mon Sep 17 00:00:00 2001
From: "Juergen E. Fischer" <jef@norbit.de>
Date: Mon, 24 Feb 2014 14:05:11 +0100
Subject: [PATCH] oracle provider: replace rownum=0 with 1=0 to retrieve
 columns (fixes #9633)

---
 src/providers/oracle/qgsoracleprovider.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

dakcarto

diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
index e5f4c27..1e298ea 100644
--- a/python/CMakeLists.txt
+++ b/python/CMakeLists.txt
@@ -91,6 +91,12 @@ INCLUDE_DIRECTORIES(
 FILE(GLOB_RECURSE sip_files_gui gui/*.sip)
 SET(SIP_EXTRA_FILES_DEPEND ${sip_files_core} ${sip_files_gui})
 SET(SIP_EXTRA_OPTIONS ${PYQT4_SIP_FLAGS} -o -a ${CMAKE_BINARY_DIR}/python/qgis.gui.api)
+
+IF(UNIX AND NOT SIP_VERSION_NUM LESS 265984)

dakcarto

diff --git a/src/app/composer/qgscomposermanager.cpp b/src/app/composer/qgscomposermanager.cpp
index 83521be..14b26bc 100644
--- a/src/app/composer/qgscomposermanager.cpp
+++ b/src/app/composer/qgscomposermanager.cpp
@@ -133,6 +133,13 @@ void QgsComposerManager::refreshComposers()
   }
 }
 
+void QgsComposerManager::activate()
+{

dakcarto

diff --git a/src/corelib/tools/qstring.cpp b/src/corelib/tools/qstring.cpp
index 7c8986f..b48c081 100644
--- a/src/corelib/tools/qstring.cpp
+++ b/src/corelib/tools/qstring.cpp
@@ -3585,7 +3585,7 @@ static inline __m128i mergeQuestionMarks(__m128i chunk)
 {
     const __m128i questionMark = _mm_set1_epi16('?');
 
-# ifdef __SSE4_2__
+# if defined(QT_HAVE_SSE4_2) && defined(__SSE4_2__)

dakcarto

require 'formula'

class Qt < Formula
  homepage 'http://qt-project.org/'
  url "http://download.qt-project.org/official_releases/qt/4.8/4.8.6/qt-everywhere-opensource-src-4.8.6.tar.gz"
  sha1 "ddf9c20ca8309a116e0466c42984238009525da6"

  head 'git://gitorious.org/qt/qt.git', :branch => '4.8'

  bottle do

dakcarto

diff --git a/configure b/configure
index 1bcff74..0a37a3f 100755
--- a/configure
+++ b/configure
@@ -29089,13 +29089,13 @@ if test "$with_armadillo" = "yes" ; then
     rm -f testarmadillo
     echo '#include <armadillo>' > testarmadillo.cpp
     echo 'int main(int argc, char** argv) { arma::mat matInput(2,2); const arma::mat& matInv = arma::inv(matInput); return 0; } ' >> testarmadillo.cpp
-    if test -z "`${CXX} ${CPPFLAGS} testarmadillo.cpp -o testarmadillo -larmadillo ${LIBS} 2>&1`" ; then
+    if test -z "`${CXX} ${CPPFLAGS} testarmadillo.cpp -o testarmadillo -larmadillo 2>&1`" ; then