OrgLion-ML
/
dlib
mirror of https://github.com/davisking/dlib.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Minor changes to avoid conflicts and warnings in visual studio.

This commit is contained in:
Davis King 2013-12-04 18:34:45 -05:00
parent 56d69eeed1
commit 8e80150f00
2 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dlib/external/libjpeg/jmorecfg.h vendored
View File

@ -49,6 +49,16 @@
* arrays is very slow on your hardware, you might want to change these. * arrays is very slow on your hardware, you might want to change these.
*/ */
#ifdef _MSC_VER
// Disable the following warnings for Visual Studio
// This is a warning you get from visual studio 2005 about things in the standard C++
// library being "deprecated." I checked the C++ standard and it doesn't say jack
// about any of them (I checked the searchable PDF). So this warning is total Bunk.
#pragma warning(disable : 4996)
#endif
#if BITS_IN_JSAMPLE == 8 #if BITS_IN_JSAMPLE == 8
/* JSAMPLE should be the smallest type that will hold the values 0..255. /* JSAMPLE should be the smallest type that will hold the values 0..255.
* You can use a signed char by having GETJSAMPLE mask it with 0xFF. * You can use a signed char by having GETJSAMPLE mask it with 0xFF.
@ -187,7 +197,9 @@ typedef unsigned int JDIMENSION;
#ifdef NEED_FAR_POINTERS #ifdef NEED_FAR_POINTERS
#define FAR far #define FAR far
#else #else
#define FAR #ifndef FAR
#define FAR
#endif
#endif #endif

9
dlib/external/libpng/pngconf.h vendored
View File

@ -19,6 +19,15 @@
* and png_info. * and png_info.
*/ */
#ifdef _MSC_VER
// Disable the following warnings for Visual Studio
// This is a warning you get from visual studio 2005 about things in the standard C++
// library being "deprecated." I checked the C++ standard and it doesn't say jack
// about any of them (I checked the searchable PDF). So this warning is total Bunk.
#pragma warning(disable : 4996)
#endif
#ifndef PNGCONF_H #ifndef PNGCONF_H
#define PNGCONF_H #define PNGCONF_H