Merge pull request #441 from pandell/ignore-winwarnings

Ignore Visual C++ 2013 compilation warnings

binding.gyp

@@ -45,7 +45,27 @@
           'defines': [
             'snprintf=_snprintf',
             '_USE_MATH_DEFINES' # for M_PI
-          ]
+          ],
+          'configurations': {
+            'Debug': {
+              'msvs_settings': {
+                'VCCLCompilerTool': {
+                  'WarningLevel': 4,
+                  'ExceptionHandling': 1,
+                  'DisableSpecificWarnings': [4100, 4127, 4201, 4244, 4267, 4506, 4611, 4714]
+                }
+              }
+            },
+            'Release': {
+              'msvs_settings': {
+                'VCCLCompilerTool': {
+                  'WarningLevel': 4,
+                  'ExceptionHandling': 1,
+                  'DisableSpecificWarnings': [4100, 4127, 4201, 4244, 4267, 4506, 4611, 4714]
+                }
+              }
+            }
+          }
         }, { # 'OS!="win"'
           'libraries': [
             '<!@(pkg-config pixman-1 --libs)',

src/CanvasGradient.h

@@ -8,7 +8,6 @@
 #ifndef __NODE_GRADIENT_H__
 #define __NODE_GRADIENT_H__
 
-#include <nan.h>
 #include "Canvas.h"
 
 class Gradient: public node::ObjectWrap {

src/CanvasPattern.h

@@ -8,7 +8,6 @@
 #ifndef __NODE_PATTERN_H__
 #define __NODE_PATTERN_H__
 
-#include <nan.h>
 #include "Canvas.h"
 
 class Pattern: public node::ObjectWrap {

src/FontFace.cc

@@ -6,8 +6,6 @@
 
 #include "FontFace.h"
 
-#include <nan.h>
-
 Persistent<FunctionTemplate> FontFace::constructor;
 
 /*

src/Image.h

@@ -8,7 +8,6 @@
 #ifndef __NODE_IMAGE_H__
 #define __NODE_IMAGE_H__
 
-#include <nan.h>
 #include "Canvas.h"
 
 #ifdef HAVE_JPEG

src/JPEGStream.h

@@ -6,7 +6,6 @@
 #ifndef __NODE_JPEG_STREAM_H__
 #define __NODE_JPEG_STREAM_H__
 
-#include <nan.h>
 #include "Canvas.h"
 #include <jpeglib.h>
 #include <jerror.h>

src/PixelArray.cc

@@ -9,8 +9,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <nan.h>
-
 Persistent<FunctionTemplate> PixelArray::constructor;
 
 /*

src/color.cc

@@ -350,10 +350,10 @@ rgba_from_rgba_string(const char *str, short *ok) {
       if ('0' == *str) ++str;
       if ('.' == *str) {
         ++str;
-        float n = .1;
+        float n = .1f;
         while (*str >= '0' && *str <= '9') {
           a += (*str++ - '0') * n;
-          n *= .1;
+          n *= .1f;
         }
       }
     }