diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-12-31 07:07:14 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-12-31 07:07:14 +0400 |
commit | 81f5c9ed9b8193864f1c6160aed9eef9338f0d27 (patch) | |
tree | de71a52d3ed2c5a1fd47a846af5d68e1c571e606 /source/blender/editors/screen | |
parent | 50ca81154e5ead104723ba137942e92cb860ace8 (diff) | |
parent | 792452a7e53aa92361145e415491943bc91d8a6e (diff) |
svn merge ^/trunk/blender -r42991:43009
Diffstat (limited to 'source/blender/editors/screen')
-rw-r--r-- | source/blender/editors/screen/glutil.c | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/source/blender/editors/screen/glutil.c b/source/blender/editors/screen/glutil.c index 8f04940efd6..0b231ee7b96 100644 --- a/source/blender/editors/screen/glutil.c +++ b/source/blender/editors/screen/glutil.c @@ -45,9 +45,6 @@ #include "BIF_gl.h" #include "BIF_glutil.h" -#include "IMB_imbuf.h" -#include "IMB_imbuf_types.h" - #ifndef GL_CLAMP_TO_EDGE #define GL_CLAMP_TO_EDGE 0x812F #endif @@ -562,27 +559,6 @@ void glaDrawPixelsTex(float x, float y, int img_w, int img_h, int format, void * glaDrawPixelsTexScaled(x, y, img_w, img_h, format, rect, 1.0f, 1.0f); } -/* row_w is unused but kept for completeness */ -void glaDrawPixelsSafe_to32(float fx, float fy, int img_w, int img_h, int UNUSED(row_w), float *rectf, int do_gamma_correct) -{ - unsigned char *rect32; - int profile_from= (do_gamma_correct)? IB_PROFILE_LINEAR_RGB: IB_PROFILE_SRGB; - int predivide= 0; - - /* copy imgw-imgh to a temporal 32 bits rect */ - if(img_w<1 || img_h<1) return; - - rect32= MEM_mallocN(img_w*img_h*sizeof(int), "temp 32 bits"); - - IMB_buffer_byte_from_float(rect32, rectf, - 4, 0, IB_PROFILE_SRGB, profile_from, predivide, - img_w, img_h, img_w, img_w); - - glaDrawPixelsSafe(fx, fy, img_w, img_h, img_w, GL_RGBA, GL_UNSIGNED_BYTE, rect32); - - MEM_freeN(rect32); -} - void glaDrawPixelsSafe(float x, float y, int img_w, int img_h, int row_w, int format, int type, void *rect) { float xzoom= glaGetOneFloat(GL_ZOOM_X); |