浏览代码

fix bad fix in previous fix

Sean Barrett 11 年之前
父节点
当前提交
bcefca10f7
共有 2 个文件被更改,包括 5 次插入7 次删除
  1. 1 1
      README.md
  2. 4 6
      stb_image.h

+ 1 - 1
README.md

@@ -6,7 +6,7 @@ single-file public domain libraries for C/C++
 library    | lastest version | category | description
 --------------------- | ---- | -------- | --------------------------------
 **stb_vorbis.c** | 1.02 | audio | decode ogg vorbis files from file/memory to float/16-bit signed output
-**stb_image.h** | 1.42 | graphics | image loading/decoding from file/memory: JPG, PNG, TGA, BMP, PSD, GIF, HDR, PIC
+**stb_image.h** | 1.43 | graphics | image loading/decoding from file/memory: JPG, PNG, TGA, BMP, PSD, GIF, HDR, PIC
 **stb_truetype.h** | 0.8b | graphics | parse, decode, and rasterize characters from truetype fonts
 **stb_image_write.h** | 0.94 | graphics | image writing to disk: PNG, TGA, BMP
 **stretchy_buffer.h** | 1.01 | utility | typesafe dynamic array for C (i.e. approximation to vector<>), doesn't compile as C++

+ 4 - 6
stb_image.h

@@ -1,4 +1,4 @@
-/* stb_image - v1.42 - public domain JPEG/PNG reader - http://nothings.org/stb_image.c
+/* stb_image - v1.43 - public domain JPEG/PNG reader - http://nothings.org/stb_image.c
    when you control the images you're loading
                                      no warranty implied; use at your own risk
 
@@ -28,6 +28,7 @@
       - overridable dequantizing-IDCT, YCbCr-to-RGB conversion (define STBI_SIMD)
 
    Latest revisions:
+      1.43 (2014-07-15) fix MSVC-only bug in 1.42
       1.42 (2014-07-09) no _CRT_SECURE_NO_WARNINGS; error-path fixes; STBI_ASSERT
       1.41 (2014-06-25) fix search&replace that messed up comments/error messages
       1.40 (2014-06-22) gcc warning
@@ -4552,13 +4553,10 @@ STBIDEF int stbi_info_from_callbacks(stbi_io_callbacks const *c, void *user, int
 
 #endif // STB_IMAGE_IMPLEMENTATION
 
-#if !defined(STBI_NO_STDIO) && defined(_MSC_VER) && _MSC_VER >= 1400
-#pragma warning(pop)
-#endif
-
-
 /*
    revision history:
+      1.43 (2014-07-15)
+             fix MSVC-only compiler problem in code changed in 1.42
       1.42 (2014-07-09)
              don't define _CRT_SECURE_NO_WARNINGS (affects user code)
              fixes to stbi__cleanup_jpeg path