[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [11945] trunk/blender: fix svn properties for line endings
Andrea Weikert
elubie at gmx.net
Wed Sep 5 19:55:44 CEST 2007
Revision: 11945
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11945
Author: elubie
Date: 2007-09-05 19:55:44 +0200 (Wed, 05 Sep 2007)
Log Message:
-----------
fix svn properties for line endings
fix a few no newlines at end of file warnings
Modified Paths:
--------------
trunk/blender/source/blender/imbuf/IMB_thumbs.h
trunk/blender/source/blender/imbuf/intern/IMB_imginfo.h
trunk/blender/source/blender/imbuf/intern/imginfo.c
trunk/blender/source/blender/imbuf/intern/md5.c
trunk/blender/source/blender/imbuf/intern/md5.h
trunk/blender/source/blender/imbuf/intern/thumbs.c
trunk/blender/source/blender/include/BIF_filelist.h
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_invert.c
trunk/blender/source/blender/src/filelist.c
trunk/blender/source/blender/src/fsmenu.c
trunk/blender/source/blender/src/prvicons.c
Property Changed:
----------------
trunk/blender/release/datafiles/prvicons
trunk/blender/source/blender/imbuf/IMB_thumbs.h
trunk/blender/source/blender/imbuf/intern/IMB_imginfo.h
trunk/blender/source/blender/imbuf/intern/imginfo.c
trunk/blender/source/blender/imbuf/intern/md5.c
trunk/blender/source/blender/imbuf/intern/md5.h
trunk/blender/source/blender/imbuf/intern/thumbs.c
trunk/blender/source/blender/include/BIF_filelist.h
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_invert.c
trunk/blender/source/blender/src/filelist.c
trunk/blender/source/blender/src/fsmenu.c
trunk/blender/source/blender/src/prvicons.c
Property changes on: trunk/blender/release/datafiles/prvicons
___________________________________________________________________
Name: svn:mime-type
- application/octet-stream
+ image/png
Modified: trunk/blender/source/blender/imbuf/IMB_thumbs.h
===================================================================
--- trunk/blender/source/blender/imbuf/IMB_thumbs.h 2007-09-05 14:31:04 UTC (rev 11944)
+++ trunk/blender/source/blender/imbuf/IMB_thumbs.h 2007-09-05 17:55:44 UTC (rev 11945)
@@ -1,73 +1,74 @@
-/**
- * $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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- * The Original Code is Copyright (C) 2007 Blender Foundation
- * All rights reserved.
- *
- * The Original Code is: all of this file.
- *
- * Contributor(s): Andrea Weikert.
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-
-#ifndef _IMB_THUMBS_H
-#define _IMB_THUMBS_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct ImBuf;
-
-/** Thumbnail creation and retrieval according to the 'Thumbnail Management Standard'
- * supported by Gimp, Gnome (Nautilus), KDE etc.
- * Reference: http://jens.triq.net/thumbnail-spec/index.html
- */
-
-
-typedef enum ThumbSize {
- THB_NORMAL,
- THB_LARGE,
- THB_FAIL
-} ThumbSize;
-
-typedef enum ThumbSource {
- THB_SOURCE_IMAGE,
- THB_SOURCE_MOVIE
-} ThumbSource;
-
-// IB_imginfo
-
-/* create thumbnail for file and returns new imbuf for thumbnail */
-ImBuf* IMB_thumb_create(const char* dir, const char* file, ThumbSize size, ThumbSource source);
-
-/* read thumbnail for file and returns new imbuf for thumbnail */
-ImBuf* IMB_thumb_read(const char* dir, const char* file, ThumbSize size);
-
-/* delete all thumbs for the file */
-void IMB_thumb_delete(const char* dir, const char* file, ThumbSize size);
-
-/* return the state of the thumb, needed to determine how to manage the thumb */
-ImBuf* IMB_thumb_manage(const char* dir, const char* file, ThumbSize size, ThumbSource source);
-
-
-
-
-#endif /* _IMB_THUMBS_H */
+/**
+ * $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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * The Original Code is Copyright (C) 2007 Blender Foundation
+ * All rights reserved.
+ *
+ * The Original Code is: all of this file.
+ *
+ * Contributor(s): Andrea Weikert.
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+#ifndef _IMB_THUMBS_H
+#define _IMB_THUMBS_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct ImBuf;
+
+/** Thumbnail creation and retrieval according to the 'Thumbnail Management Standard'
+ * supported by Gimp, Gnome (Nautilus), KDE etc.
+ * Reference: http://jens.triq.net/thumbnail-spec/index.html
+ */
+
+
+typedef enum ThumbSize {
+ THB_NORMAL,
+ THB_LARGE,
+ THB_FAIL
+} ThumbSize;
+
+typedef enum ThumbSource {
+ THB_SOURCE_IMAGE,
+ THB_SOURCE_MOVIE
+} ThumbSource;
+
+// IB_imginfo
+
+/* create thumbnail for file and returns new imbuf for thumbnail */
+ImBuf* IMB_thumb_create(const char* dir, const char* file, ThumbSize size, ThumbSource source);
+
+/* read thumbnail for file and returns new imbuf for thumbnail */
+ImBuf* IMB_thumb_read(const char* dir, const char* file, ThumbSize size);
+
+/* delete all thumbs for the file */
+void IMB_thumb_delete(const char* dir, const char* file, ThumbSize size);
+
+/* return the state of the thumb, needed to determine how to manage the thumb */
+ImBuf* IMB_thumb_manage(const char* dir, const char* file, ThumbSize size, ThumbSource source);
+
+
+
+
+#endif /* _IMB_THUMBS_H */
+
Property changes on: trunk/blender/source/blender/imbuf/IMB_thumbs.h
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Modified: trunk/blender/source/blender/imbuf/intern/IMB_imginfo.h
===================================================================
--- trunk/blender/source/blender/imbuf/intern/IMB_imginfo.h 2007-09-05 14:31:04 UTC (rev 11944)
+++ trunk/blender/source/blender/imbuf/intern/IMB_imginfo.h 2007-09-05 17:55:44 UTC (rev 11945)
@@ -1,78 +1,79 @@
-/**
- * $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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- * The Original Code is Copyright (C) 2005 Blender Foundation
- * All rights reserved.
- *
- * The Original Code is: all of this file.
- *
- * Contributor(s): Austin Benesh. Ton Roosendaal.
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-
-#ifndef _IMB_IMGINFO_H
-#define _IMB_IMGINFO_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct ImBuf;
-
-typedef struct ImgInfo {
- struct ImgInfo *next, *prev;
- char* key;
- char* value;
- int len;
-} ImgInfo;
-
-/** The imginfo is a list of key/value pairs (both char*) that can me
- saved in the header of several image formats.
- Apart from some common keys like
- 'Software' and 'Description' (png standard) we'll use keys within the
- Blender namespace, so should be called 'Blender::StampInfo' or 'Blender::FrameNum'
- etc...
-*/
-
-
-/* free blender ImgInfo struct */
-void IMB_imginfo_free(struct ImBuf* img);
-
-/** read the field from the image info into the field
- * @param img - the ImBuf that contains the image data
- * @param key - the key of the field
- * @param value - the data in the field, first one found with key is returned,
- memory has to be allocated by user.
- * @param len - length of value buffer allocated by user.
- * @return - 1 (true) if ImageInfo present and value for the key found, 0 (false) otherwise
- */
-int IMB_imginfo_get_field(struct ImBuf* img, const char* key, char* value, int len);
-
-/** set user data in the ImgInfo struct, which has to be allocated with IMB_imginfo_create
- * before calling this function.
- * @param img - the ImBuf that contains the image data
- * @param key - the key of the field
- * @param value - the data to be written to the field. zero terminated string
- * @return - 1 (true) if ImageInfo present, 0 (false) otherwise
- */
-int IMB_imginfo_add_field(struct ImBuf* img, const char* key, const char* field);
-
-
-#endif /* _IMB_IMGINFO_H */
+/**
+ * $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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * The Original Code is Copyright (C) 2005 Blender Foundation
+ * All rights reserved.
+ *
+ * The Original Code is: all of this file.
+ *
+ * Contributor(s): Austin Benesh. Ton Roosendaal.
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+#ifndef _IMB_IMGINFO_H
+#define _IMB_IMGINFO_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct ImBuf;
+
+typedef struct ImgInfo {
+ struct ImgInfo *next, *prev;
+ char* key;
+ char* value;
+ int len;
+} ImgInfo;
+
+/** The imginfo is a list of key/value pairs (both char*) that can me
+ saved in the header of several image formats.
+ Apart from some common keys like
+ 'Software' and 'Description' (png standard) we'll use keys within the
+ Blender namespace, so should be called 'Blender::StampInfo' or 'Blender::FrameNum'
+ etc...
+*/
+
+
+/* free blender ImgInfo struct */
+void IMB_imginfo_free(struct ImBuf* img);
+
+/** read the field from the image info into the field
+ * @param img - the ImBuf that contains the image data
+ * @param key - the key of the field
+ * @param value - the data in the field, first one found with key is returned,
+ memory has to be allocated by user.
+ * @param len - length of value buffer allocated by user.
+ * @return - 1 (true) if ImageInfo present and value for the key found, 0 (false) otherwise
+ */
+int IMB_imginfo_get_field(struct ImBuf* img, const char* key, char* value, int len);
+
+/** set user data in the ImgInfo struct, which has to be allocated with IMB_imginfo_create
+ * before calling this function.
+ * @param img - the ImBuf that contains the image data
+ * @param key - the key of the field
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list