sean-m
/
stb
mirror of https://github.com/nothings/stb.git
1
0
Fork 0
Code Issues Releases Activity
1,499 Commits
2 Branches
0 Tags
3.7 MiB
Commit Graph

287 Commits (1b9689cf77b94010951ba81a0e834902b642bdb9)

Author SHA1 Message Date
Sean Barrett 24fa816116 merge https://github.com/nothings/stb/pull/427 but I messed up the merge 
so you don't get the automatic info you normally do
 2017-03-18 18:32:35 -07:00
Sean Barrett 6d60610348 tweaks to previous merge 2017-03-18 18:15:41 -07:00
Sean Barrett 00c2545510 Merge branch 'rgb-detect' of https://github.com/jeremysawicki/stb into working 2017-03-18 18:08:00 -07:00
Sean Barrett 8fe48099cc add comment for next fix prematurely 2017-03-18 18:07:51 -07:00
Sean Barrett 5bbe1d8c2a fixes to that PR 2017-03-18 18:03:34 -07:00
Sean Barrett 55112399e6 Merge branch 'master' of https://github.com/uTox/stb into working 2017-03-18 17:47:54 -07:00
Sean Barrett be6d13cd6d fix bug in png decoding with 1,2,4-bpp images using filter that samples previous line 2017-03-18 10:54:22 -07:00
Vladislav 667f35578b statically initialize 2017-03-08 21:16:50 +05:00
Fabian Giesen 22c72a069c stb_image: Support optional args consistently. 
My guideline for the rules is the PNG loader (which I consider
"canonical"). In the _load functions, x and y are required but
comp is optional; in the _info functions, all three are optional.

Fixes issue #411 (and other related, unreported issues).
 2017-03-04 21:17:09 -08:00
Fabian Giesen 3e17544873 stb_image: Give up trying to runtime-detect SSE2 on GCC. 
We tried but it was nothing but trouble. New rule: with
GCC/Clang, if you're compiling with -msse2, you get always-on
SSE2 code, otherwise you don't get any. Trying to ship
anything with proper runtime dispatch requires both working
around certain bugs and some fiddling with build settings,
which runs contrary to the intent of a one-file library,
so bail on it entirely.

Fixes issue #280.
Fixes issue #410.
 2017-03-04 20:49:14 -08:00
Jeremy Sawicki 9e76bb5108 stb_image: JPEG: Improved detection of RGB images 2017-03-03 16:24:21 -08:00
Gregory Mullen (grayhatter) 16c83cd5fc
Fix a pair of warnings in stb_image.h 2017-03-03 11:26:34 -08:00
Sean Barrett 6a3d4786c9 Merge branch 'unknown-marker' of https://github.com/jeremysawicki/stb into working 2017-03-03 08:40:07 -08:00
Sean Barrett 7e389e85c1 Merge branch 'dnl-segment' of https://github.com/jeremysawicki/stb into working 2017-03-03 08:39:31 -08:00
Sean Barrett 15c7e06dc8 Merge branch 'junk-before-marker' of https://github.com/jeremysawicki/stb into working 2017-03-03 08:38:06 -08:00
Sean Barrett dc6089f05b tweak fill byte PR 2017-03-03 08:37:30 -08:00
Sean Barrett 50ae79d811 Merge branch 'fill-bytes' of https://github.com/jeremysawicki/stb into working 2017-03-03 08:36:03 -08:00
Sean Barrett a6dc061137 tweak 16-bit quantization for clarity 2017-03-03 08:35:14 -08:00
Sean Barrett 0befbc3d78 Merge branch 'dequant-16-bits' of https://github.com/jeremysawicki/stb into working 2017-03-03 08:31:57 -08:00
Sean Barrett 014af7b78a Merge branch 'component-ids' of https://github.com/jeremysawicki/stb into working 2017-03-03 08:30:57 -08:00
Sean Barrett 786ac92daa tweak RGB-to-Y conversion 2017-03-03 08:30:49 -08:00
Sean Barrett 64e1799f24 Merge branch 'rgb-grayscale' of https://github.com/jeremysawicki/stb into working 2017-03-03 08:25:29 -08:00
Sean Barrett 8905cb9a8e Merge branch 'patch-1' of https://github.com/RufUsul/stb into working 2017-03-03 08:21:46 -08:00
Sean Barrett 47685c5f84 remove deprecated old-precision jpg path from stb_image.h 
tweak license reference wording
 2017-03-03 08:19:09 -08:00
Sean Barrett e248e30954 change license to public-domain AND mit (based on twitter vote) 2017-03-03 07:53:07 -08:00
Jeremy Sawicki f5f7dc02a1 stb_image: JPEG: Provide failure reason for unknown marker 2017-03-03 01:11:34 -08:00
Jeremy Sawicki 2219a6da29 stb_image: JPEG: Accept DNL segment 2017-03-03 00:13:27 -08:00
Jeremy Sawicki 6f5677946c stb_image: JPEG: Accept non-zero junk bytes at the end of image data 2017-03-02 23:48:02 -08:00
Jeremy Sawicki 344c3f73d5 stb_image: JPEG: Accept fill bytes in stbi__grow_buffer_unsafe 2017-03-02 23:10:03 -08:00
Jeremy Sawicki e08d398671 stb_image: JPEG: Accept 16-bit quantization tables 2017-03-02 22:32:30 -08:00
Jeremy Sawicki 34fa37bbb4 stb_image: JPEG: Accept any component IDs 2017-03-02 21:40:40 -08:00
Jeremy Sawicki cb7ffb2408 stb_image: Update contributors 2017-03-02 18:19:21 -08:00
Jeremy Sawicki 552c548a0e stb_image: JPEG: Convert RGB to grayscale properly 2017-03-02 18:06:10 -08:00
themanagainstthetank 7e989db555 update stb_image.h 
int raw_data[4] to 0, or the compiler bugs
 2017-01-16 18:12:31 +08:00
Sean Barrett 96620a3a54 update version numbers 2017-01-16 00:51:24 -08:00
Sean Barrett dead3815e2 credits 2017-01-16 00:05:58 -08:00
Sean Barrett 28c24f7b83 Merge branch 'fix-truncation' of https://github.com/sammyhw/stb into working 2017-01-15 23:58:26 -08:00
Sean Barrett 48710234f2 credits; 1/2/4-bit png fix; easy font spacing; NO_STDIO in image_write 2017-01-15 23:57:53 -08:00
Thomas Ruf f07727a28a stb_image.h: large structures on the stack 
more of "allocate large structures on the stack", this time in the forgotten stbi__jpeg_test
-> avoids the infamous _chkstk() when working with CRT
 2016-12-28 14:16:45 +01:00
sammyhw ec9db6f84b allow for all 16 bits 2016-12-15 23:49:19 -05:00
Sean Barrett b61b7a74fa update version info 2016-12-04 05:40:21 -08:00
Sean Barrett 7bcaa93a76 Merge branch 'master' of https://github.com/Zelex/stb into merging 
Also add more credits
Also fix linking multiple copies with STB_IMAGE_STATIC

Conflicts:
	stb_image.h
 2016-12-04 05:38:47 -08:00
Sean Barrett 7759a2a93d fix "misleading indentation" gcc warning 2016-12-04 05:25:24 -08:00
Sean Barrett ae241feec4 Merge branch 'stb_img_overflows' of https://github.com/rygorous/stb into working 
Conflicts:
	stb_image.h
 2016-12-04 05:20:57 -08:00
Sean Barrett 7736399517 return 16-bit PSDs through 16-bit API (untested) 2016-12-04 05:13:58 -08:00
Sean Barrett e0700d8e2c 16-bit png changes 2016-11-29 04:13:17 -08:00
Sean Barrett 239a6718e1 rename stbi_load parameters to reduce confusion 2016-11-29 03:03:07 -08:00
jon 2a170daee5 warning fixes, more RGBE fix 2016-11-28 16:24:11 -06:00
jon a2defc3d7a added support for RGBE header HDR files 2016-11-28 16:05:39 -06:00
Fabian Giesen 6b66033e18 stb_image: Fix memory leak and missing out-of-mem check. 
stbi__process_frame_header had two bugs when dealing with progressive
JPEGs:
1. when malloc failed allocating raw_data, previous components'
   raw_coeff didn't get freed
2. no out-of-memory check in raw_coeff allocation

Fix both and share a bit more cleanup code in general.
 2016-10-22 00:29:37 -07:00
Fabian Giesen 62f372754f stb_image: Fix HDR/PSD RLE decoders. 
Runs need to be bounds checked.

Fixes issues #315, #317.
 2016-10-22 00:29:37 -07:00
Fabian Giesen 02190634c2 stb_image: Overflow checking for image allocs. 
Adds some helpers that check whether a product of multiple
factors (that need to be non-negative: this is enforced)
summed with another non-negative value overflows when
performed as int. Since stb_image mostly works in ints,
this seems like the safest route. Limits size of images
to 2GB but several of the decoders already enforce this
limit (or even lower ones).

Also adds wrappers for malloc that combine a mul-add-with-
overflow-check with the actual malloc, and return NULL
on failure. Then use them when allocating something that
is the product of multiple factors.

For image formats, also add a top-level "is this too big?"
check that gives a more useful error message; otherwise,
the failed mallocs result in an "out of memory" error.
The idea is that the top-level checks should be the primary
way to catch these bugs (and produce a useful error message).
But a misleading error message is still vastly preferable to
a buffer overflow exploit.

Fixes issues #310, #313, #314, #318. (Verified with the
provided test images)

Along the way, this fixes a previously unnoticed bug in
ldr_to_hdr / hdr_to_ldr (missing NULL check); these functions
are called with the result of an image decoder, so NULLs can
definitely happen.

Another bug noticed along the way is that handling of
interlaced 16-bit PNGs was incorrect. Fixing this (along
with the previous modifications) fixes issue #311.

Yet another bug noticed during this change is that reduce_png
did not check the right pointer during its out of memory
check. Fix that too.
 2016-10-22 00:29:37 -07:00
Fabian Giesen 8c8d735eb7 stb_image: More input validation in deflate decoder 
Fixes issue #312.
 2016-10-22 00:29:37 -07:00
Sean Barrett fdca443892 fix crash in 2.11 2016-04-02 07:29:34 -07:00
Sean Barrett 6e4154737c update version numbers, documentation, and contributors 2016-04-02 04:51:26 -07:00
Sean Barrett 7a694bdcca re-enable SSE2 code on x64 except with gcc 2016-04-02 04:01:59 -07:00
Sean Barrett 201af99d9f return correct # of channels for PNG 2016-04-02 03:49:46 -07:00
Sean Barrett 591c7f8cb3 remove white matting when loading transparent PSD 2016-04-02 03:44:50 -07:00
Sean Barrett c03f4b3c2f Merge branch 'patch-1' of https://github.com/kinetiknz/stb 2016-04-02 02:57:34 -07:00
Sean Barrett 097a70ae38 Merge branch 'master' of https://github.com/tulrich/stb 2016-04-02 02:56:39 -07:00
Sean Barrett a013c036f3 initialize bmp mr/mg/mb/ma properly 2016-04-02 02:54:25 -07:00
Sean Barrett 406d537b41 Merge branch 'initial_png_16bpc' of https://github.com/socks-the-fox/stb into working 2016-04-02 02:41:16 -07:00
Sean Barrett efdfbb3c7c Merge branch 'master' into working 2016-04-01 21:43:22 -07:00
Sean Barrett 50479cb07c stb_image: allow jpegs that are rgb not YCrCb 2016-03-26 15:46:59 -07:00
Matthew Gregan 94f2ceac15 Fix typo in stbi__parse_uncompressed_block 2016-03-12 01:55:59 +13:00
Thatcher Ulrich 7e1ee2d386 Allocate large structure using malloc instead of stack. 2016-03-02 15:56:53 -05:00
Thatcher Ulrich 291ad22e84 Replace large stack allocations with dynamic allocations. 2016-03-02 15:31:07 -05:00
Craig Donner ee6978cb68 Slightly modify the public domain license to keep it in the public domain, but make it clear that even when dedications might not be recognized that the code is still usable. Given that this isn't dual-licensing under a different license, I'm hoping this will be acceptable. 2016-02-25 12:55:44 -08:00
Socks the Fox eb84b2179b Initial 16 bit per channel PNG support 2016-01-22 12:42:40 -06:00
Sean Barrett 30015ef464 attempt to fix unused var warnings in stb_image 2.09 2016-01-22 04:06:28 -08:00
Sean Barrett 472c4c82a4 update version history 2016-01-16 10:00:19 -08:00
Sean Barrett ac748cba9b update contributor list, version history, version number 2016-01-16 09:57:04 -08:00
Sean Barrett 82ca643ef3 change previous explicitly-sized realloc support to be new API and unbreak old API 2016-01-16 09:47:22 -08:00
Sean Barrett 853fda6132 Merge branch 'alt_realloc' of https://github.com/romigrou/stb into working 2016-01-16 09:38:13 -08:00
Sean Barrett c8e50127c5 contributor list 2016-01-16 09:37:34 -08:00
Sean Barrett 32d5e7ca7f Merge branch '16bit-tga' of https://github.com/DanielGibson/stb into working 2016-01-16 08:15:58 -08:00
Sean Barrett 9cb29b6b39 update and reorganize contributor list 2016-01-16 08:13:55 -08:00
Sean Barrett 5746aa023a Merge branch 'stbi_hdr_info_overread' of https://github.com/baldurk/stb into working 2016-01-16 08:05:51 -08:00
Sean Barrett e30b75af8b update contributor list 2016-01-16 08:05:40 -08:00
Sean Barrett c7e24f4c4c Merge branch 'master' of https://github.com/svdijk/stb into working 2016-01-16 08:03:22 -08:00
Sean Barrett 1964d53d70 update version number and version history with everything committed to date 2016-01-16 08:01:42 -08:00
Romain Bailly 7e741ffc1e Added the old size as argument to the STBI_REALLOC() and STBIW_REALLOC() macros 2016-01-14 10:34:30 +01:00
Daniel Gibson 87a0396922 stb_image.h: 16 bit TGAs don't really have an alpha channel 
I claimed that if the most significant bit of a 16bit pixel is set,
it should be opaque (as is suggested by some sources on the internet),
but implemented the opposite.
If implemented "correctly", lots of 16bit TGAs become invisible.. so I
guess 16bit TGAs aren't really supposed to have an alpha-channel, or at
least most 16bit TGAs (despite having set an "alpha-bit" in the "image
descriptor byte") in the wild don't seem to work like that.

So just assume 16bit non-greyscale TGAs are always STBI_rgb without
an alpha channel.
 2015-12-06 05:47:47 +01:00
Daniel Gibson d235049322 stb_image.h: Fix TGA colormap support 
* Calculate correct stb format (incl. proper 16bit support) also when
  using a colormap (palette)
* Create colormap with tga_comp, to correctly support 16bit RGB
  (instead of using tga_palette_bits/8 and just copying the data)
* For TGAs with colormap, the TGA bits per pixel field specifies the
  size of an index to the colormap - the "real" color depth
  of the image is saved in the color map specification's bits per pixel
  field. I think only 8 and 16bit indices make sense (16 should be
  supported, otherwise the colormap length could be u8 instead of u16),
  so I added support for both.
* Helper functions stbi__tga_get_comp() to calculate stb pixelformat and
  stbi__tga_read_rgb16() to read one 16bit pixel and convert it to
  24/32bit RGB(A) - for less duplicate code
 2015-12-06 04:33:37 +01:00
Daniel Gibson 57409c3d15 stb_image.h: Improve stbi__tga_info() and stbi__tga_test() 
* for paletted images, .._info()'s comp should be based on the palette's
  bits per pixel, not the images bits per pixel (which describes the
  size of an index into the palette and is also checked now)
* make sure the color (map) type and the image type fields of the header
  are consistent (=> if TGA color type is 1 for paletted, the TGA image
  type must be 1 or 9)
* .._test() does some more checks and uses stbi__get16le() instead of
  stbi__get16be() - TGA is little endian.
* .._test() now always rewinds (sometimes it used to do only return 0;
  without rewinding)
* remove "error check" at the beginning of stbi__tga_load(), because
  all that is already tested in stbi__tga_test()
 2015-12-06 04:33:30 +01:00
Daniel Gibson 7453e1bfa4 stb_image.h: Support 15/16bit per pixel RGB(A) TGAs 
stbi__tga_* assumed that 16bit TGAs were Grayscale + Alpha.
However, if the TGA imagetype is not one of the gray ones, it's 16Bit
RGB data, with 5 Bits per channel. If the TGA image descriptor field
has alpha bits (the 3 least significant ones) set, the pixel's most
significant bit is for alpha: 1 for opaque and 0 for translucent.
Furthermore people claim that TGAs can also pretend to have 15bpp,
which is the same as 16bpp but definitely without alpha.

So 15/16bpp TGAs are now decoded to STBI_rgb(_alpha).
 2015-12-06 00:25:22 +01:00
baldurk 4337345c5d Prevent HDR info function from trashing stbi context by over-reading 2015-11-14 13:14:26 +01:00
Sean Barrett 297ff62859 change bmp info to use common header parser 2015-11-08 13:09:16 -08:00
Sean Barrett 876aea3dbe refactor bmp header parser for sharing with stbi_info 2015-11-08 01:22:30 -08:00
Sean Barrett 0615df6c9b allows comments in pgm/ppm headers 2015-11-08 00:45:17 -08:00
svdijk 9f1a587d22 stb_image.h: Fix/add some comments. 2015-11-05 23:34:44 +01:00
svdijk 8603c6e809 stb_image.h: Only define stbi__l2h_{gamme,scale} when needed. 
This fixes a (well, actually the only) compiler warning.
 2015-11-05 23:32:40 +01:00
Sean Barrett 6b8938124e Merge branch 'fix-vs2015-warnings' of https://github.com/Reedbeta/stb into working 2015-09-13 11:09:23 -07:00
Sean Barrett d5b8af12cb fix missing "defined" in #if defined(STBI_NO_foo); 
fix incorrect initialization of alpha channel for RGB PSD
 2015-09-13 11:08:40 -07:00
Nathan Reed 36574182c0 Fix new VS2015 warnings in stb_image 2.07 
- conversion from int to stbi_uc
- unused parameter
 2015-09-13 11:00:46 -07:00
Sean Barrett 90dc93a1cc fix bug where we couldn't rewind a file that reached EOF, which can happen with < 92-byte PIC,PNM,HDR,TGA 2015-09-13 05:41:21 -07:00
Sean Barrett 28a29dd0f1 credit for michaelangel007 patch 2015-09-13 05:15:09 -07:00
Sean Barrett ddd05479e9 Merge branch 'master' of https://github.com/Michaelangel007/stb into working 2015-09-13 05:13:57 -07:00
Sean Barrett 0eb5da55a7 er, fix typo in the fix-rmitton checkin 2015-09-13 05:12:53 -07:00
Sean Barrett 082289b528 Merge branch 'master' of https://github.com/rmitton/stb into working 2015-09-13 05:12:35 -07:00