[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [32926] trunk/blender/source/blender/ editors/space_file/writeimage.c: removed unused code for image loading, was copied from 2.49 and never used.

Andrea Weikert elubie at gmx.net
Sun Nov 7 17:22:25 CET 2010


Revision: 32926
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32926
Author:   elubie
Date:     2010-11-07 17:22:25 +0100 (Sun, 07 Nov 2010)

Log Message:
-----------
removed unused code for image loading, was copied from 2.49 and never used.

Removed Paths:
-------------
    trunk/blender/source/blender/editors/space_file/writeimage.c

Deleted: trunk/blender/source/blender/editors/space_file/writeimage.c
===================================================================
--- trunk/blender/source/blender/editors/space_file/writeimage.c	2010-11-07 16:20:44 UTC (rev 32925)
+++ trunk/blender/source/blender/editors/space_file/writeimage.c	2010-11-07 16:22:25 UTC (rev 32926)
@@ -1,234 +0,0 @@
-/**
- * $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 *****
- */
-
-#include <string.h>
-
-
-#include "IMB_imbuf.h"
-#include "IMB_imbuf_types.h"
-
-#include "BLI_blenlib.h"
-
-#include "DNA_scene_types.h"
-#include "DNA_screen_types.h"
-#include "DNA_space_types.h"
-
-#include "BKE_context.h"
-#include "BKE_global.h"
-#include "BKE_main.h"
-#include "BKE_image.h"
-
-#include "RE_pipeline.h"
-
-#include "file_intern.h"
-
-/* XXX */
-static void error(const char *UNUSED(dummy)) {}
-static void waitcursor(int UNUSED(val)) {}
-static void activate_fileselect(int UNUSED(d1), char *UNUSED(d2), char *UNUSED(d3), void *UNUSED(d4)) {}
-static int saveover(const char *UNUSED(dummy)) {return 0;}
-/* XXX */
-
-
-/* ------------------------------------------------------------------------- */
-
-/* callback for fileselect to save rendered image, renderresult was checked to exist */
-static void save_rendered_image_cb_real(char *name, int confirm)
-{
-	Scene *scene= NULL; // XXX
-	char str[FILE_MAXDIR+FILE_MAXFILE];
-	int overwrite;
-	
-	if(BLI_testextensie(name,".blend")) {
-		error("Wrong filename");
-		return;
-	}
-	
-	/* BKE_add_image_extension() checks for if extension was already set */
-	if(scene->r.scemode & R_EXTENSION) 
-		if(strlen(name)<FILE_MAXDIR+FILE_MAXFILE-5)
-			BKE_add_image_extension(name, scene->r.imtype);
-
-	strcpy(str, name);
-	BLI_path_abs(str, G.main->name);
-
-	if (confirm)
-		overwrite = saveover(str);
-	else
-		overwrite = 1;
-	
-	if(overwrite) {
-		if(scene->r.imtype==R_MULTILAYER) {
-			Render *re= RE_GetRender(scene->id.name);
-			RenderResult *rr= RE_AcquireResultRead(re);
-			if(rr) 
-				RE_WriteRenderResult(rr, str, scene->r.quality);
-			RE_ReleaseResult(re);
-		}
-		else {
-			Render *re= RE_GetRender(scene->id.name);
-			RenderResult rres;
-			ImBuf *ibuf;
-			
-			RE_AcquireResultImage(re, &rres);
-
-			waitcursor(1); /* from screen.c */
-
-			ibuf= IMB_allocImBuf(rres.rectx, rres.recty, scene->r.planes, 0);
-			ibuf->rect= (unsigned int *)rres.rect32;
-			ibuf->rect_float= rres.rectf;
-			ibuf->zbuf_float= rres.rectz;
-			
-			/* float factor for random dither, imbuf takes care of it */
-			ibuf->dither= scene->r.dither_intensity;
-			
-			BKE_write_ibuf(scene, ibuf, str, scene->r.imtype, scene->r.subimtype, scene->r.quality);
-			IMB_freeImBuf(ibuf);	/* imbuf knows rects are not part of ibuf */
-
-			RE_ReleaseResultImage(re);
-		}
-		
-		strcpy(G.ima, name);
-		
-		waitcursor(0);
-	}
-}
-
-
-void save_image_filesel_str(Scene *scene, char *str)
-{
-	switch(scene->r.imtype) {
-#ifdef WITH_HDR
-		case R_RADHDR:
-			strcpy(str, "Save Radiance HDR");
-			break;
-#endif
-		case R_FFMPEG:
-		case R_H264:
-		case R_XVID:
-		case R_THEORA:
-		case R_PNG:
-			strcpy(str, "Save PNG");
-			break;
-#ifdef WITH_DDS
-		case R_DDS:
-			strcpy(str, "Save DDS");
-			break;
-#endif
-		case R_BMP:
-			strcpy(str, "Save BMP");
-			break;
-#ifdef WITH_TIFF
-		case R_TIFF:
-			strcpy(str, "Save TIFF");
-			break;
-#endif
-#ifdef WITH_OPENEXR
-		case R_OPENEXR:
-			strcpy(str, "Save OpenEXR");
-			break;
-#endif
-#ifdef WITH_CINEON
-		case R_CINEON:
-			strcpy(str, "Save Cineon");
-			break;
-		case R_DPX:
-			strcpy(str, "Save DPX");
-			break;
-#endif
-		case R_RAWTGA:
-			strcpy(str, "Save Raw Targa");
-			break;
-		case R_IRIS:
-			strcpy(str, "Save IRIS");
-			break;
-		case R_IRIZ:
-			strcpy(str, "Save IRIS");
-			break;
-		case R_TARGA:
-			strcpy(str, "Save Targa");
-			break;
-		case R_MULTILAYER:
-			strcpy(str, "Save Multi Layer EXR");
-			break;
-#ifdef WITH_OPENJPEG
-		case R_JP2:
-			strcpy(str, "Save JPEG2000");
-			break;
-#endif
-			/* default we save jpeg, also for all movie formats */
-		case R_JPEG90:
-		case R_AVICODEC:
-		case R_AVIRAW:
-		case R_AVIJPEG:
-		default:
-			strcpy(str, "Save JPEG");
-			break;
-	}	
-}
-
-static void save_rendered_image_cb(char *name) 
-{
-	save_rendered_image_cb_real(name, 1);
-}
-
-/* no fileselect, no confirm */
-void BIF_save_rendered_image(char *name)
-{
-	save_rendered_image_cb_real(name, 0);
-}
-	
-/* calls fileselect */
-void BIF_save_rendered_image_fs(Scene *scene)
-{
-	Render *re= RE_GetRender(scene->id.name);
-	RenderResult rres;
-	
-	RE_AcquireResultImage(re, &rres);
-
-	if(!rres.rectf && !rres.rect32) {
-		error("No image rendered");
-	} 
-	else {
-		char dir[FILE_MAXDIR * 2], str[FILE_MAXFILE * 2];
-		
-		if(G.ima[0]==0) {
-			strcpy(dir, G.main->name);
-			BLI_splitdirstring(dir, str);
-			strcpy(G.ima, dir);
-		}
-		
-		save_image_filesel_str(scene, str);
-		activate_fileselect(FILE_SPECIAL, str, G.ima, save_rendered_image_cb);
-	}
-
-	RE_ReleaseResultImage(re);
-}
-
-





More information about the Bf-blender-cvs mailing list