Skip to content

Ignore Visual C++ 2013 compilation warnings #441

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TooTallNate merged 4 commits into from
Jun 26, 2014
Merged

Ignore Visual C++ 2013 compilation warnings #441

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1705973
Ignore Visual C++ 2013 warnings
milang Jun 26, 2014
ba4038b
Use float constants to prevent double->float conversion warning
milang Jun 26, 2014
13049ac
Remove unneeded #include <nan.h>
milang Jun 26, 2014
99230e5
Duplicate "msvc_settings" for "Debug" configuration
milang Jun 26, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 21 additions & 1 deletion binding.gyp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)',
Expand Down
1 change: 0 additions & 1 deletion src/CanvasGradient.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
#ifndef __NODE_GRADIENT_H__
#define __NODE_GRADIENT_H__

#include <nan.h>
#include "Canvas.h"

class Gradient: public node::ObjectWrap {
Expand Down
1 change: 0 additions & 1 deletion src/CanvasPattern.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
#ifndef __NODE_PATTERN_H__
#define __NODE_PATTERN_H__

#include <nan.h>
#include "Canvas.h"

class Pattern: public node::ObjectWrap {
Expand Down
2 changes: 0 additions & 2 deletions src/FontFace.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@

#include "FontFace.h"

#include <nan.h>

Persistent<FunctionTemplate> FontFace::constructor;

/*
Expand Down
1 change: 0 additions & 1 deletion src/Image.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
#ifndef __NODE_IMAGE_H__
#define __NODE_IMAGE_H__

#include <nan.h>
#include "Canvas.h"

#ifdef HAVE_JPEG
Expand Down
1 change: 0 additions & 1 deletion src/JPEGStream.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 0 additions & 2 deletions src/PixelArray.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@
#include <stdlib.h>
#include <string.h>

#include <nan.h>

Persistent<FunctionTemplate> PixelArray::constructor;

/*
Expand Down
4 changes: 2 additions & 2 deletions src/color.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
}
Expand Down