[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [35103] trunk/blender/source/blender: remove unused functions,
Campbell Barton
ideasman42 at gmail.com
Wed Feb 23 10:12:55 CET 2011
Revision: 35103
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35103
Author: campbellbarton
Date: 2011-02-23 09:12:55 +0000 (Wed, 23 Feb 2011)
Log Message:
-----------
remove unused functions,
note: BPY_class_validate() could come in handy later if we need to check classes for properties/functions but for now there is no point in keeping it in.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/BKE_displist.h
trunk/blender/source/blender/blenkernel/intern/displist.c
trunk/blender/source/blender/editors/space_console/console_draw.c
trunk/blender/source/blender/editors/space_console/console_intern.h
trunk/blender/source/blender/imbuf/intern/IMB_filetype.h
trunk/blender/source/blender/imbuf/intern/jpeg.c
trunk/blender/source/blender/python/intern/bpy_util.c
trunk/blender/source/blender/python/intern/bpy_util.h
Modified: trunk/blender/source/blender/blenkernel/BKE_displist.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_displist.h 2011-02-23 09:10:15 UTC (rev 35102)
+++ trunk/blender/source/blender/blenkernel/BKE_displist.h 2011-02-23 09:12:55 UTC (rev 35103)
@@ -101,7 +101,6 @@
extern void shadeMeshMCol(struct Scene *scene, struct Object *ob, struct Mesh *me);
int surfindex_displist(DispList *dl, int a, int *b, int *p1, int *p2, int *p3, int *p4);
-void imagestodisplist(void);
void reshadeall_displist(struct Scene *scene);
void filldisplist(struct ListBase *dispbase, struct ListBase *to, int flipnormal);
Modified: trunk/blender/source/blender/blenkernel/intern/displist.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/displist.c 2011-02-23 09:10:15 UTC (rev 35102)
+++ trunk/blender/source/blender/blenkernel/intern/displist.c 2011-02-23 09:12:55 UTC (rev 35103)
@@ -1936,11 +1936,6 @@
return orco;
}
-void imagestodisplist(void)
-{
- /* removed */
-}
-
/* this is confusing, there's also min_max_object, appplying the obmat... */
static void boundbox_displist(Object *ob)
{
Modified: trunk/blender/source/blender/editors/space_console/console_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_console/console_draw.c 2011-02-23 09:10:15 UTC (rev 35102)
+++ trunk/blender/source/blender/editors/space_console/console_draw.c 2011-02-23 09:12:55 UTC (rev 35103)
@@ -233,18 +233,6 @@
return console_textview_main__internal(sc, ar, 0, mval, NULL, NULL);
}
-void *console_text_pick(struct SpaceConsole *sc, struct ARegion *ar, int mouse_y)
-{
- void *mouse_pick= NULL;
- int mval[2];
-
- mval[0]= 0;
- mval[1]= mouse_y;
-
- console_textview_main__internal(sc, ar, 0, mval, &mouse_pick, NULL);
- return (void *)mouse_pick;
-}
-
int console_char_pick(struct SpaceConsole *sc, struct ARegion *ar, int mval[2])
{
int pos_pick= 0;
Modified: trunk/blender/source/blender/editors/space_console/console_intern.h
===================================================================
--- trunk/blender/source/blender/editors/space_console/console_intern.h 2011-02-23 09:10:15 UTC (rev 35102)
+++ trunk/blender/source/blender/editors/space_console/console_intern.h 2011-02-23 09:12:55 UTC (rev 35103)
@@ -34,7 +34,6 @@
/* console_draw.c */
void console_textview_main(struct SpaceConsole *sc, struct ARegion *ar);
int console_textview_height(struct SpaceConsole *sc, struct ARegion *ar); /* needed to calculate the scrollbar */
-void *console_text_pick(struct SpaceConsole *sc, struct ARegion *ar, int mouse_y); /* needed for selection */
int console_char_pick(struct SpaceConsole *sc, struct ARegion *ar, int mval[2]);
void console_scrollback_prompt_begin(struct SpaceConsole *sc, ConsoleLine *cl_dummy);
Modified: trunk/blender/source/blender/imbuf/intern/IMB_filetype.h
===================================================================
--- trunk/blender/source/blender/imbuf/intern/IMB_filetype.h 2011-02-23 09:10:15 UTC (rev 35102)
+++ trunk/blender/source/blender/imbuf/intern/IMB_filetype.h 2011-02-23 09:12:55 UTC (rev 35103)
@@ -81,7 +81,6 @@
/* jpeg */
int imb_is_a_jpeg(unsigned char *mem);
int imb_savejpeg(struct ImBuf *ibuf, const char *name, int flags);
-struct ImBuf * imb_ibJpegImageFromFilename (const char * filename, int flags);
struct ImBuf * imb_load_jpeg (unsigned char * buffer, size_t size, int flags);
/* bmp */
Modified: trunk/blender/source/blender/imbuf/intern/jpeg.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/jpeg.c 2011-02-23 09:10:15 UTC (rev 35102)
+++ trunk/blender/source/blender/imbuf/intern/jpeg.c 2011-02-23 09:12:55 UTC (rev 35103)
@@ -434,37 +434,6 @@
return(ibuf);
}
-ImBuf * imb_ibJpegImageFromFilename (const char * filename, int flags)
-{
- struct jpeg_decompress_struct _cinfo, *cinfo = &_cinfo;
- struct my_error_mgr jerr;
- FILE * infile;
- ImBuf * ibuf;
-
- if ((infile = fopen(filename, "rb")) == NULL) return 0;
-
- cinfo->err = jpeg_std_error(&jerr.pub);
- jerr.pub.error_exit = jpeg_error;
-
- /* Establish the setjmp return context for my_error_exit to use. */
- if (setjmp(jerr.setjmp_buffer)) {
- /* If we get here, the JPEG code has signaled an error.
- * We need to clean up the JPEG object, close the input file, and return.
- */
- jpeg_destroy_decompress(cinfo);
- fclose(infile);
- return NULL;
- }
-
- jpeg_create_decompress(cinfo);
- jpeg_stdio_src(cinfo, infile);
-
- ibuf = ibJpegImageFromCinfo(cinfo, flags);
-
- fclose(infile);
- return(ibuf);
-}
-
ImBuf * imb_load_jpeg (unsigned char * buffer, size_t size, int flags)
{
struct jpeg_decompress_struct _cinfo, *cinfo = &_cinfo;
Modified: trunk/blender/source/blender/python/intern/bpy_util.c
===================================================================
--- trunk/blender/source/blender/python/intern/bpy_util.c 2011-02-23 09:10:15 UTC (rev 35102)
+++ trunk/blender/source/blender/python/intern/bpy_util.c 2011-02-23 09:12:55 UTC (rev 35103)
@@ -36,94 +36,6 @@
bContext* BPy_GetContext(void) { return __py_context; }
void BPy_SetContext(bContext *C) { __py_context= C; }
-int BPY_class_validate(const char *class_type, PyObject *class, PyObject *base_class, BPY_class_attr_check* class_attrs, PyObject **py_class_attrs)
-{
- PyObject *item, *fitem;
- PyObject *py_arg_count;
- int i, arg_count;
-
- if (base_class) {
- if (!PyObject_IsSubclass(class, base_class)) {
- PyObject *name= PyObject_GetAttrString(base_class, "__name__");
- PyErr_Format(PyExc_AttributeError, "expected %s subclass of class \"%s\"", class_type, name ? _PyUnicode_AsString(name):"<UNKNOWN>");
- Py_XDECREF(name);
- return -1;
- }
- }
-
- for(i= 0;class_attrs->name; class_attrs++, i++) {
- item = PyObject_GetAttrString(class, class_attrs->name);
-
- if (py_class_attrs)
- py_class_attrs[i]= item;
-
- if (item==NULL) {
- if ((class_attrs->flag & BPY_CLASS_ATTR_OPTIONAL)==0) {
- PyErr_Format(PyExc_AttributeError, "expected %s class to have an \"%s\" attribute", class_type, class_attrs->name);
- return -1;
- }
-
- PyErr_Clear();
- }
- else {
- Py_DECREF(item); /* no need to keep a ref, the class owns it */
-
- if((item==Py_None) && (class_attrs->flag & BPY_CLASS_ATTR_NONE_OK)) {
- /* dont do anything, this is ok, dont bother checking other types */
- }
- else {
- switch(class_attrs->type) {
- case 's':
- if (PyUnicode_Check(item)==0) {
- PyErr_Format(PyExc_AttributeError, "expected %s class \"%s\" attribute to be a string", class_type, class_attrs->name);
- return -1;
- }
- if(class_attrs->len != -1 && class_attrs->len < PyUnicode_GetSize(item)) {
- PyErr_Format(PyExc_AttributeError, "expected %s class \"%s\" attribute string to be shorter then %d", class_type, class_attrs->name, class_attrs->len);
- return -1;
- }
-
- break;
- case 'l':
- if (PyList_Check(item)==0) {
- PyErr_Format(PyExc_AttributeError, "expected %s class \"%s\" attribute to be a list", class_type, class_attrs->name);
- return -1;
- }
- if(class_attrs->len != -1 && class_attrs->len < PyList_GET_SIZE(item)) {
- PyErr_Format(PyExc_AttributeError, "expected %s class \"%s\" attribute list to be shorter then %d", class_type, class_attrs->name, class_attrs->len);
- return -1;
- }
- break;
- case 'f':
- if (PyMethod_Check(item))
- fitem= PyMethod_Function(item); /* py 2.x */
- else
- fitem= item; /* py 3.x */
-
- if (PyFunction_Check(fitem)==0) {
- PyErr_Format(PyExc_AttributeError, "expected %s class \"%s\" attribute to be a function", class_type, class_attrs->name);
- return -1;
- }
- if (class_attrs->arg_count >= 0) { /* -1 if we dont care*/
- py_arg_count = PyObject_GetAttrString(PyFunction_GET_CODE(fitem), "co_argcount");
- arg_count = PyLong_AsSsize_t(py_arg_count);
- Py_DECREF(py_arg_count);
-
- if (arg_count != class_attrs->arg_count) {
- PyErr_Format(PyExc_AttributeError, "expected %s class \"%s\" function to have %d args", class_type, class_attrs->name, class_attrs->arg_count);
- return -1;
- }
- }
- break;
- }
- }
- }
- }
- return 0;
-}
-
-
-
char *BPy_enum_as_string(EnumPropertyItem *item)
{
DynStr *dynstr= BLI_dynstr_new();
Modified: trunk/blender/source/blender/python/intern/bpy_util.h
===================================================================
--- trunk/blender/source/blender/python/intern/bpy_util.h 2011-02-23 09:10:15 UTC (rev 35102)
+++ trunk/blender/source/blender/python/intern/bpy_util.h 2011-02-23 09:12:55 UTC (rev 35103)
@@ -34,24 +34,8 @@
struct EnumPropertyItem;
struct ReportList;
-/* Class type checking, use for checking classes can be added as operators, panels etc */
-typedef struct BPY_class_attr_check {
- const char *name; /* name of the class attribute */
- char type; /* 's' = string, 'f' = function, 'l' = list, (add as needed) */
- int arg_count; /* only for function types, -1 for undefined, includes self arg */
- int len; /* only for string types currently */
- int flag; /* other options */
-} BPY_class_attr_check;
-
-/* BPY_class_attr_check, flag */
-#define BPY_CLASS_ATTR_OPTIONAL 1
-#define BPY_CLASS_ATTR_NONE_OK 2
-
-int BPY_class_validate(const char *class_type, PyObject *class, PyObject *base_class, BPY_class_attr_check* class_attrs, PyObject **py_class_attrs);
-
char *BPy_enum_as_string(struct EnumPropertyItem *item);
-
#define BLANK_PYTHON_TYPE {PyVarObject_HEAD_INIT(NULL, 0) NULL}
/* error reporting */
More information about the Bf-blender-cvs
mailing list