diff options
Diffstat (limited to 'source/blender/blenlib/intern')
-rw-r--r-- | source/blender/blenlib/intern/BLI_callbacks.h | 46 | ||||
-rw-r--r-- | source/blender/blenlib/intern/callbacks.c | 70 | ||||
-rw-r--r-- | source/blender/blenlib/intern/math_color.c | 5 |
3 files changed, 75 insertions, 46 deletions
diff --git a/source/blender/blenlib/intern/BLI_callbacks.h b/source/blender/blenlib/intern/BLI_callbacks.h deleted file mode 100644 index ad09339e61a..00000000000 --- a/source/blender/blenlib/intern/BLI_callbacks.h +++ /dev/null @@ -1,46 +0,0 @@ -/* - * blenlib/BLI_editVert.h mar 2001 Nzc - * - * These callbacks are needed in the lib - * - * $Id$ - * - * ***** BEGIN GPL LICENSE BLOCK ***** - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * - * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. - * All rights reserved. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL LICENSE BLOCK ***** - */ - -/** \file blender/blenlib/intern/BLI_callbacks.h - * \ingroup bli - */ - - -#ifndef BLI_CALLBACKS_H -#define BLI_CALLBACKS_H - -// This is blenlib internal only -void callLocalErrorCallBack(const char* msg); - -#endif - diff --git a/source/blender/blenlib/intern/callbacks.c b/source/blender/blenlib/intern/callbacks.c new file mode 100644 index 00000000000..a033e01696d --- /dev/null +++ b/source/blender/blenlib/intern/callbacks.c @@ -0,0 +1,70 @@ +/* + * $Id$ + * + * ***** BEGIN GPL LICENSE BLOCK ***** + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * Contributor(s): Blender Foundation (2011) + * + * ***** END GPL LICENSE BLOCK ***** + */ + +#include "BLI_utildefines.h" +#include "BLI_listbase.h" +#include "BLI_callbacks.h" + +#include "MEM_guardedalloc.h" + +static ListBase callback_slots[BLI_CB_EVT_TOT]= {{0}}; + +void BLI_exec_cb(struct Main *main, struct ID *self, eCbEvent evt) +{ + ListBase *lb= &callback_slots[evt]; + bCallbackFuncStore *funcstore; + + for(funcstore= (bCallbackFuncStore *)lb->first; funcstore; funcstore= (bCallbackFuncStore *)funcstore->next) { + funcstore->func(main, self, funcstore->arg); + } +} + +void BLI_add_cb(bCallbackFuncStore *funcstore, eCbEvent evt) +{ + ListBase *lb= &callback_slots[evt]; + BLI_addtail(lb, funcstore); +} + +void BLI_cb_init(void) +{ + /* do nothing */ +} + +/* call on application exit */ +void BLI_cb_finalize(void) +{ + eCbEvent evt; + for(evt= 0; evt < BLI_CB_EVT_TOT; evt++) { + ListBase *lb= &callback_slots[evt]; + bCallbackFuncStore *funcstore; + bCallbackFuncStore *funcstore_next; + for(funcstore= (bCallbackFuncStore *)lb->first; funcstore; funcstore= funcstore_next) { + funcstore_next= (bCallbackFuncStore *)funcstore->next; + BLI_remlink(lb, funcstore); + if(funcstore->alloc) { + MEM_freeN(funcstore); + } + } + } +} diff --git a/source/blender/blenlib/intern/math_color.c b/source/blender/blenlib/intern/math_color.c index ef1d5da56d8..93143eb7db3 100644 --- a/source/blender/blenlib/intern/math_color.c +++ b/source/blender/blenlib/intern/math_color.c @@ -488,6 +488,11 @@ float rgb_to_grayscale(float rgb[3]) return 0.3f*rgb[0] + 0.58f*rgb[1] + 0.12f*rgb[2]; } +unsigned char rgb_to_grayscale_byte(unsigned char rgb[3]) +{ + return (76*(unsigned short)rgb[0] + 148*(unsigned short)rgb[1] + 31*(unsigned short)rgb[2]) / 255; +} + /* ********************************* lift/gamma/gain / ASC-CDL conversion ********************************* */ void lift_gamma_gain_to_asc_cdl(float *lift, float *gamma, float *gain, float *offset, float *slope, float *power) |