aboutsummaryrefslogtreecommitdiff
path: root/src/FbTk
diff options
context:
space:
mode:
Diffstat (limited to 'src/FbTk')
-rw-r--r--src/FbTk/TextureRender.cc33
1 files changed, 6 insertions, 27 deletions
diff --git a/src/FbTk/TextureRender.cc b/src/FbTk/TextureRender.cc
index fc7d76d..1ad1b16 100644
--- a/src/FbTk/TextureRender.cc
+++ b/src/FbTk/TextureRender.cc
@@ -22,12 +22,11 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: TextureRender.cc,v 1.1 2003/01/09 21:09:49 fluxgen Exp $ 25// $Id: TextureRender.cc,v 1.2 2003/01/10 01:02:02 fluxgen Exp $
26 26
27#include "TextureRender.hh" 27#include "TextureRender.hh"
28 28
29#include "ImageControl.hh" 29#include "ImageControl.hh"
30#include "i18n.hh"
31#include "App.hh" 30#include "App.hh"
32 31
33#include <iostream> 32#include <iostream>
@@ -118,10 +117,7 @@ Pixmap TextureRender::renderSolid(const FbTk::Texture &texture) {
118 RootWindow(disp, control.screenNum()), width, 117 RootWindow(disp, control.screenNum()), width,
119 height, control.depth()); 118 height, control.depth());
120 if (pixmap == None) { 119 if (pixmap == None) {
121 cerr<<I18n::instance()-> 120 cerr<<"FbTk::TextureRender::render_solid(): error creating pixmap"<<endl;
122 getMessage(
123 FBNLS::ImageSet, FBNLS::ImageErrorCreatingSolidPixmap,
124 "BImage::render_solid: error creating pixmap")<<endl;
125 return None; 121 return None;
126 } 122 }
127 123
@@ -263,7 +259,6 @@ Pixmap TextureRender::renderGradient(const FbTk::Texture &texture) {
263 259
264 260
265XImage *TextureRender::renderXImage() { 261XImage *TextureRender::renderXImage() {
266 I18n *i18n = I18n::instance();
267 Display *disp = FbTk::App::instance()->display(); 262 Display *disp = FbTk::App::instance()->display();
268 XImage *image = 263 XImage *image =
269 XCreateImage(disp, 264 XCreateImage(disp,
@@ -271,11 +266,7 @@ XImage *TextureRender::renderXImage() {
271 width, height, 32, 0); 266 width, height, 32, 0);
272 267
273 if (! image) { 268 if (! image) {
274 fprintf(stderr, 269 cerr<<"FbTk::TextureRender::renderXImage(): error creating XImage"<<endl;
275 i18n->
276 getMessage(
277 FBNLS::ImageSet, FBNLS::ImageErrorCreatingXImage,
278 "BImage::renderXImage: error creating XImage\n"));
279 return 0; 270 return 0;
280 } 271 }
281 272
@@ -546,11 +537,7 @@ XImage *TextureRender::renderXImage() {
546 */ 537 */
547 538
548 default: 539 default:
549 fprintf(stderr, 540 cerr<<"TextureRender::renderXImage(): unsupported visual"<<endl;
550 i18n->
551 getMessage(
552 FBNLS::ImageSet, FBNLS::ImageUnsupVisual,
553 "BImage::renderXImage: unsupported visual\n"));
554 delete [] d; 541 delete [] d;
555 XDestroyImage(image); 542 XDestroyImage(image);
556 return (XImage *) 0; 543 return (XImage *) 0;
@@ -649,11 +636,7 @@ XImage *TextureRender::renderXImage() {
649 break; 636 break;
650 637
651 default: 638 default:
652 fprintf(stderr, 639 cerr<<"TextureRender::renderXImage(): unsupported visual"<<endl;
653 i18n->
654 getMessage(
655 FBNLS::ImageSet, FBNLS::ImageUnsupVisual,
656 "BImage::renderXImage: unsupported visual\n"));
657 delete [] d; 640 delete [] d;
658 XDestroyImage(image); 641 XDestroyImage(image);
659 return (XImage *) 0; 642 return (XImage *) 0;
@@ -667,16 +650,12 @@ return image;
667 650
668Pixmap TextureRender::renderPixmap() { 651Pixmap TextureRender::renderPixmap() {
669 Display *disp = FbTk::App::instance()->display(); 652 Display *disp = FbTk::App::instance()->display();
670 I18n *i18n = I18n::instance();
671 Pixmap pixmap = 653 Pixmap pixmap =
672 XCreatePixmap(disp, 654 XCreatePixmap(disp,
673 RootWindow(disp, control.screenNum()), width, height, control.depth()); 655 RootWindow(disp, control.screenNum()), width, height, control.depth());
674 656
675 if (pixmap == None) { 657 if (pixmap == None) {
676 fprintf(stderr, 658 cerr<<"TextureRender::renderPixmap(): error creating pixmap"<<endl;
677 i18n->getMessage(
678 FBNLS::ImageSet, FBNLS::ImageErrorCreatingPixmap,
679 "BImage::renderPixmap: error creating pixmap\n"));
680 return None; 659 return None;
681 } 660 }
682 661