[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39249] branches/soc-2011-tomato/source/ blender: Camera tracking integration

[Sergey Sharybin]

Revision: 39249
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39249
Author:   nazgul
Date:     2011-08-10 10:29:39 +0000 (Wed, 10 Aug 2011)
Log Message:
-----------
Camera tracking integration
===========================

Fixed wrong jpeg files saved by proxy builder.

Additional changes:
  - Fixed some wrong copyrights in my own files.
  - Added copyrights headers to Peter's indexer files.

Modified Paths:
--------------
    branches/soc-2011-tomato/source/blender/blenkernel/intern/movieclip.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/sequencer.c
    branches/soc-2011-tomato/source/blender/imbuf/intern/filter.c
    branches/soc-2011-tomato/source/blender/imbuf/intern/indexer.c
    branches/soc-2011-tomato/source/blender/imbuf/intern/indexer_dv.c

Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/movieclip.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/movieclip.c	2011-08-10 09:30:45 UTC (rev 39248)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/movieclip.c	2011-08-10 10:29:39 UTC (rev 39249)
@@ -17,7 +17,7 @@
  * 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.
+ * The Original Code is Copyright (C) 2011 Blender Foundation.
  * All rights reserved.
  *
  * Contributor(s): Blender Foundation,
@@ -790,10 +790,14 @@
 		quality= clip->proxy.quality;
 		scaleibuf->ftype= JPG | quality;
 
+		/* unsupported feature only confuses other s/w */
+		if(scaleibuf->depth==32)
+			scaleibuf->depth= 24;
+
 		BLI_lock_thread(LOCK_MOVIECLIP);
 
 		BLI_make_existing_file(name);
-		if(IMB_saveiff(scaleibuf, name, IB_rect | IB_zbuf | IB_zbuffloat)==0)
+		if(IMB_saveiff(scaleibuf, name, IB_rect)==0)
 			perror(name);
 
 		BLI_unlock_thread(LOCK_MOVIECLIP);

Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/sequencer.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/sequencer.c	2011-08-10 09:30:45 UTC (rev 39248)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/sequencer.c	2011-08-10 10:29:39 UTC (rev 39249)
@@ -1318,6 +1318,10 @@
 	quality = seq->strip->proxy->quality;
 	ibuf->ftype= JPG | quality;
 
+	/* unsupported feature only confuses other s/w */
+	if(ibuf->depth==32)
+		ibuf->depth= 24;
+
 	BLI_make_existing_file(name);
 	
 	ok = IMB_saveiff(ibuf, name, IB_rect | IB_zbuf | IB_zbuffloat);

Modified: branches/soc-2011-tomato/source/blender/imbuf/intern/filter.c
===================================================================
--- branches/soc-2011-tomato/source/blender/imbuf/intern/filter.c	2011-08-10 09:30:45 UTC (rev 39248)
+++ branches/soc-2011-tomato/source/blender/imbuf/intern/filter.c	2011-08-10 10:29:39 UTC (rev 39249)
@@ -1,4 +1,5 @@
 /*
+ * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
@@ -26,7 +27,6 @@
  * ***** END GPL LICENSE BLOCK *****
  * filter.c
  *
- * $Id$
  */
 
 /** \file blender/imbuf/intern/filter.c

Modified: branches/soc-2011-tomato/source/blender/imbuf/intern/indexer.c
===================================================================
--- branches/soc-2011-tomato/source/blender/imbuf/intern/indexer.c	2011-08-10 09:30:45 UTC (rev 39248)
+++ branches/soc-2011-tomato/source/blender/imbuf/intern/indexer.c	2011-08-10 10:29:39 UTC (rev 39249)
@@ -1,3 +1,29 @@
+/*
+* $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.
+ *
+ * Peter Schlaile <peter [at] schlaile [dot] de> 2011
+ *
+ * Contributor(s): none yet.
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
 #include "IMB_indexer.h"
 #include "IMB_anim.h"
 #include "AVI_avi.h"

Modified: branches/soc-2011-tomato/source/blender/imbuf/intern/indexer_dv.c
===================================================================
--- branches/soc-2011-tomato/source/blender/imbuf/intern/indexer_dv.c	2011-08-10 09:30:45 UTC (rev 39248)
+++ branches/soc-2011-tomato/source/blender/imbuf/intern/indexer_dv.c	2011-08-10 10:29:39 UTC (rev 39249)
@@ -1,3 +1,29 @@
+/*
+* $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.
+ *
+ * Peter Schlaile <peter [at] schlaile [dot] de> 2011
+ *
+ * Contributor(s): none yet.
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
 #include "IMB_indexer.h"
 #include "MEM_guardedalloc.h"
 #include <time.h>