Merge remote-tracking branch 'origin/dev'

.gitignore

@@ -3,13 +3,19 @@
 *.mode1v3
 *.mode2v3
 *.user
-*.xcworkspace/
+project.xcworkspace
 xcuserdata/
+*.xccheckout
 .DS_Store
 
 build/
 lib/libcinder*.a
-lib/cinder*.lib
+lib/msw/x86/cinder*.lib
+lib/msw/x64/cinder*.lib
+lib/msw/x86/cinder*.idb
+lib/msw/x64/cinder*.idb
+lib/msw/x86/cinder*.pdb
+lib/msw/x64/cinder*.pdb
 
 # Windows cruft
 *.suo
@@ -19,3 +25,7 @@ lib/cinder*.lib
 Debug/
 Release/
 ipch/
+
+# doxygen generated files
+docs/html
+docs/doxygen/cinder.tag

README.md

@@ -1,9 +1,9 @@
-### Cinder 0.8.5: [libcinder.org](http://libcinder.org)
+### Cinder 0.8.6: [libcinder.org](http://libcinder.org)
 
 **Cinder is a peer-reviewed, free, open source C++ library for creative coding.**
 
 To get started with Cinder from GitHub, please read this [git setup document](http://libcinder.org/docs/welcome/GitSetup.html). You might also prefer one of our [pre-packaged downloads](http://libcinder.org/download/).
 
-Cinder supports Mac OS X, Windows and iOS. It requires Xcode 4.4 or later for development on the Mac, and Visual C++ 2010 or later on Windows.
+Cinder supports Mac OS X, Windows and iOS. It requires Xcode 4.4 or later for development on the Mac, and Visual C++ 2012 or later on Windows.
 
 Cinder is released under the Modified BSD License. Please read the [welcome document](Welcome.html) for more information.

blocks/Cairo/cinderblock.xml

@@ -14,12 +14,13 @@
 	<platform os="macosx">
 		<staticLibrary>lib/macosx/libcairo.a</staticLibrary>
 		<staticLibrary>lib/macosx/libpixman-1.a</staticLibrary>
-		<staticLibrary>lib/macosx/libpng14.a</staticLibrary>		
+		<staticLibrary>lib/macosx/libpng16.a</staticLibrary>		
 		<includePath system="true">include/macosx</includePath>
 	</platform>
 	<platform os="msw">
-		<staticLibrary>lib/msw/cairo-static.lib</staticLibrary>
-		<staticLibrary>lib/msw/pixman-1.lib</staticLibrary>
+		<staticLibrary>lib/msw/x86/cairo-static.lib</staticLibrary>
+		<staticLibrary>lib/msw/x86/pixman-1.lib</staticLibrary>
+		<staticLibrary absolute="true">libpng.lib</staticLibrary>
 		<includePath>include/msw</includePath>	
 	</platform>
 </block>

blocks/Cairo/include/msw/cairo-features.h

@@ -1,15 +1,18 @@
-/* Generated by Makefile.win32.  Do not edit. */
+/* Generated by Makefile.win32.features-h.  Do not edit. */
 #ifndef CAIRO_FEATURES_H
-#define CAIRO_WIN32_STATIC_BUILD
 #define CAIRO_FEATURES_H 1
 #define CAIRO_HAS_WIN32_SURFACE 1
 #define CAIRO_HAS_WIN32_FONT 1
-#define CAIRO_HAS_PNG_FUNCTIONS 0
+#define CAIRO_HAS_PNG_FUNCTIONS 1
+#define CAIRO_HAS_SCRIPT_SURFACE 1
 #define CAIRO_HAS_PS_SURFACE 1
 #define CAIRO_HAS_PDF_SURFACE 1
 #define CAIRO_HAS_SVG_SURFACE 1
 #define CAIRO_HAS_IMAGE_SURFACE 1
+#define CAIRO_HAS_MIME_SURFACE 1
 #define CAIRO_HAS_RECORDING_SURFACE 1
+#define CAIRO_HAS_OBSERVER_SURFACE 1
 #define CAIRO_HAS_USER_FONT 1
 #define CAIRO_HAS_INTERPRETER 1
+#define CAIRO_NO_MUTEX 1
 #endif

blocks/Cairo/include/msw/cairo-pdf.h

@@ -45,14 +45,14 @@ CAIRO_BEGIN_DECLS
 
 /**
  * cairo_pdf_version_t:
- * @CAIRO_PDF_VERSION_1_4: The version 1.4 of the PDF specification.
- * @CAIRO_PDF_VERSION_1_5: The version 1.5 of the PDF specification.
+ * @CAIRO_PDF_VERSION_1_4: The version 1.4 of the PDF specification. (Since 1.10)
+ * @CAIRO_PDF_VERSION_1_5: The version 1.5 of the PDF specification. (Since 1.10)
  *
  * #cairo_pdf_version_t is used to describe the version number of the PDF
  * specification that a generated PDF file will conform to.
  *
- * Since 1.10
- */
+ * Since: 1.10
+ **/
 typedef enum _cairo_pdf_version {
     CAIRO_PDF_VERSION_1_4,
     CAIRO_PDF_VERSION_1_5

blocks/Cairo/include/msw/cairo-ps.h

@@ -49,13 +49,15 @@ CAIRO_BEGIN_DECLS
 
 /**
  * cairo_ps_level_t:
- * @CAIRO_PS_LEVEL_2: The language level 2 of the PostScript specification.
- * @CAIRO_PS_LEVEL_3: The language level 3 of the PostScript specification.
+ * @CAIRO_PS_LEVEL_2: The language level 2 of the PostScript specification. (Since 1.6)
+ * @CAIRO_PS_LEVEL_3: The language level 3 of the PostScript specification. (Since 1.6)
  *
  * #cairo_ps_level_t is used to describe the language level of the
  * PostScript Language Reference that a generated PostScript file will
  * conform to.
- */
+ *
+ * Since: 1.6
+ **/
 typedef enum _cairo_ps_level {
     CAIRO_PS_LEVEL_2,
     CAIRO_PS_LEVEL_3

blocks/Cairo/include/msw/cairo-script.h

@@ -0,0 +1,98 @@
+/* cairo - a vector graphics library with display and print output
+ *
+ * Copyright © 2008 Chris Wilson
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it either under the terms of the GNU Lesser General Public
+ * License version 2.1 as published by the Free Software Foundation
+ * (the "LGPL") or, at your option, under the terms of the Mozilla
+ * Public License Version 1.1 (the "MPL"). If you do not alter this
+ * notice, a recipient may use your version of this file under either
+ * the MPL or the LGPL.
+ *
+ * You should have received a copy of the LGPL along with this library
+ * in the file COPYING-LGPL-2.1; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
+ * You should have received a copy of the MPL along with this library
+ * in the file COPYING-MPL-1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License
+ * Version 1.1 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY
+ * OF ANY KIND, either express or implied. See the LGPL or the MPL for
+ * the specific language governing rights and limitations.
+ *
+ * The Original Code is the cairo graphics library.
+ *
+ * The Initial Developer of the Original Code is Chris Wilson
+ *
+ * Contributor(s):
+ *	Chris Wilson <[email protected]>
+ */
+
+#ifndef CAIRO_SCRIPT_H
+#define CAIRO_SCRIPT_H
+
+#include "cairo.h"
+
+#if CAIRO_HAS_SCRIPT_SURFACE
+
+CAIRO_BEGIN_DECLS
+
+/**
+ * cairo_script_mode_t:
+ * @CAIRO_SCRIPT_MODE_ASCII: the output will be in readable text (default). (Since 1.12)
+ * @CAIRO_SCRIPT_MODE_BINARY: the output will use byte codes. (Since 1.12)
+ *
+ * A set of script output variants.
+ *
+ * Since: 1.12
+ **/
+typedef enum {
+    CAIRO_SCRIPT_MODE_ASCII,
+    CAIRO_SCRIPT_MODE_BINARY
+} cairo_script_mode_t;
+
+cairo_public cairo_device_t *
+cairo_script_create (const char *filename);
+
+cairo_public cairo_device_t *
+cairo_script_create_for_stream (cairo_write_func_t	 write_func,
+				void			*closure);
+
+cairo_public void
+cairo_script_write_comment (cairo_device_t *script,
+			    const char *comment,
+			    int len);
+
+cairo_public void
+cairo_script_set_mode (cairo_device_t *script,
+		       cairo_script_mode_t mode);
+
+cairo_public cairo_script_mode_t
+cairo_script_get_mode (cairo_device_t *script);
+
+cairo_public cairo_surface_t *
+cairo_script_surface_create (cairo_device_t *script,
+			     cairo_content_t content,
+			     double width,
+			     double height);
+
+cairo_public cairo_surface_t *
+cairo_script_surface_create_for_target (cairo_device_t *script,
+					cairo_surface_t *target);
+
+cairo_public cairo_status_t
+cairo_script_from_recording_surface (cairo_device_t	*script,
+				     cairo_surface_t	*recording_surface);
+
+CAIRO_END_DECLS
+
+#else  /*CAIRO_HAS_SCRIPT_SURFACE*/
+# error Cairo was not compiled with support for the CairoScript backend
+#endif /*CAIRO_HAS_SCRIPT_SURFACE*/
+
+#endif /*CAIRO_SCRIPT_H*/

blocks/Cairo/include/msw/cairo-svg.h

@@ -40,12 +40,14 @@ CAIRO_BEGIN_DECLS
 
 /**
  * cairo_svg_version_t:
- * @CAIRO_SVG_VERSION_1_1: The version 1.1 of the SVG specification.
- * @CAIRO_SVG_VERSION_1_2: The version 1.2 of the SVG specification.
+ * @CAIRO_SVG_VERSION_1_1: The version 1.1 of the SVG specification. (Since 1.2)
+ * @CAIRO_SVG_VERSION_1_2: The version 1.2 of the SVG specification. (Since 1.2)
  *
  * #cairo_svg_version_t is used to describe the version number of the SVG
  * specification that a generated SVG file will conform to.
- */
+ *
+ * Since: 1.2
+ **/
 typedef enum _cairo_svg_version {
     CAIRO_SVG_VERSION_1_1,
     CAIRO_SVG_VERSION_1_2

blocks/Cairo/include/msw/cairo.h

@@ -1,4 +1,4 @@
-/* cairo - a vector graphics library with display and print output
+/* cairo - a vector graphics library with display and print output
  *
  * Copyright © 2002 University of Southern California
  * Copyright © 2005 Red Hat, Inc.
@@ -38,6 +38,8 @@
 #ifndef CAIRO_H
 #define CAIRO_H
 
+#define CAIRO_WIN32_STATIC_BUILD 1
+
 #include "cairo-version.h"
 #include "cairo-features.h"
 #include "cairo-deprecated.h"

blocks/Cairo/src/Cairo.cpp

@@ -229,7 +229,7 @@ SurfaceImage::SurfaceImage( ImageSourceRef imageSource )
 }
 
 SurfaceImage::SurfaceImage( const SurfaceImage &other )
-	: SurfaceBase( other )
+	: SurfaceBase( other ), mCinderSurface( other.mCinderSurface )
 {
 }
 

blocks/OSC/samples/OscListener/vc2012/OscListener.sln

@@ -0,0 +1,25 @@
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2012
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OscListener", "OscListener.vcxproj", "{5893D06B-76E4-4791-9271-F48E042DBE61}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
+		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{5893D06B-76E4-4791-9271-F48E042DBE61}.Debug|Win32.ActiveCfg = Debug|Win32
+		{5893D06B-76E4-4791-9271-F48E042DBE61}.Debug|Win32.Build.0 = Debug|Win32
+		{5893D06B-76E4-4791-9271-F48E042DBE61}.Debug|x64.ActiveCfg = Debug|x64
+		{5893D06B-76E4-4791-9271-F48E042DBE61}.Debug|x64.Build.0 = Debug|x64
+		{5893D06B-76E4-4791-9271-F48E042DBE61}.Release|Win32.ActiveCfg = Release|Win32
+		{5893D06B-76E4-4791-9271-F48E042DBE61}.Release|Win32.Build.0 = Release|Win32
+		{5893D06B-76E4-4791-9271-F48E042DBE61}.Release|x64.ActiveCfg = Release|x64
+		{5893D06B-76E4-4791-9271-F48E042DBE61}.Release|x64.Build.0 = Release|x64
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal