[Bf-blender-cvs] [674d7d8] temp_imbuf_types_refactor: Merge branch 'master' into temp_imbuf_types_refactor

Antony Riakiotakis noreply at git.blender.org
Sun Jul 12 17:02:26 CEST 2015


Commit: 674d7d86d63139c9bab652c71c615bbed08a5a17
Author: Antony Riakiotakis
Date:   Sun Jul 12 17:02:13 2015 +0200
Branches: temp_imbuf_types_refactor
https://developer.blender.org/rB674d7d86d63139c9bab652c71c615bbed08a5a17

Merge branch 'master' into temp_imbuf_types_refactor

===================================================================



===================================================================

diff --cc source/blender/imbuf/intern/jpeg.c
index 536197d,8ddfd44..f2a7b7b
--- a/source/blender/imbuf/intern/jpeg.c
+++ b/source/blender/imbuf/intern/jpeg.c
@@@ -85,9 -85,9 +85,9 @@@ static ImBuf *ibJpegImageFromCinfo(stru
   */
  
  static int jpeg_default_quality;
 -static int ibuf_ftype;
 +static int ibuf_foptions;
  
- int imb_is_a_jpeg(unsigned char *mem)
+ int imb_is_a_jpeg(const unsigned char *mem)
  {
  	if ((mem[0] == 0xFF) && (mem[1] == 0xD8)) return 1;
  	return 0;




More information about the Bf-blender-cvs mailing list