vba-commit

[<for...@us...>]

Update of /cvsroot/vba/VisualBoyAdvance/src/win32
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28019

Modified Files:
	skin.cpp skin.h 
Log Message:
Added support for JPEG/PNG skin images

Index: skin.cpp
===================================================================
RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/skin.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** skin.cpp	4 Nov 2003 14:09:52 -0000	1.5
--- skin.cpp	29 Feb 2004 13:04:54 -0000	1.6
***************
*** 15,18 ****
--- 15,19 ----
  #include "skin.h"
  #include <stdio.h>
+ #include "xImage.h"
  
  #include "../System.h"
***************
*** 57,60 ****
--- 58,72 ----
  }
  
+ HBITMAP CSkin::LoadImage(const char *filename)
+ {
+   CxImage image;
+   image.Load(filename);
+   if(!image.IsValid()) {
+     return NULL;
+   }
+   
+   return image.MakeBitmap(NULL);
+ }
+ 
  // ----------------------------------------------------------------------------
  // Initialize the skin
***************
*** 383,388 ****
    if(strcmp(rgn, ""))
      rgn = path + rgn;
!   
!   m_hBmp = (HBITMAP)LoadImage(NULL, bmpName, IMAGE_BITMAP, 0, 0, LR_LOADFROMFILE|LR_CREATEDIBSECTION);
    if (!m_hBmp) {
      m_error = "Error loading skin bitmap " + bmpName;
--- 395,401 ----
    if(strcmp(rgn, ""))
      rgn = path + rgn;
! 
!   m_hBmp = LoadImage(bmpName);
! 
    if (!m_hBmp) {
      m_error = "Error loading skin bitmap " + bmpName;
***************
*** 445,455 ****
    CString normalBmp = path + buffer;
  
!   HBITMAP bmp = (HBITMAP)LoadImage(NULL,
!                                    normalBmp,
!                                    IMAGE_BITMAP,
!                                    0,
!                                    0,
!                                    LR_LOADFROMFILE|LR_CREATEDIBSECTION);
!   if (!bmp) {
      m_error = "Error loading button bitmap " + normalBmp;
      return false;
--- 458,463 ----
    CString normalBmp = path + buffer;
  
!   HBITMAP bmp = LoadImage(normalBmp);
!   if(!bmp) {
      m_error = "Error loading button bitmap " + normalBmp;
      return false;
***************
*** 464,473 ****
    CString downBmp = path + buffer;
  
!   bmp = (HBITMAP)LoadImage(NULL,
!                            downBmp,
!                            IMAGE_BITMAP,
!                            0,
!                            0,
!                            LR_LOADFROMFILE|LR_CREATEDIBSECTION);
    if (!bmp) {
      m_error = "Error loading button down bitmap " + downBmp;
--- 472,477 ----
    CString downBmp = path + buffer;
  
!   bmp = LoadImage(downBmp);
! 
    if (!bmp) {
      m_error = "Error loading button down bitmap " + downBmp;
***************
*** 479,488 ****
      CString overBmp = path + buffer;
  
!     bmp = (HBITMAP)LoadImage(NULL,
!                              overBmp,
!                              IMAGE_BITMAP,
!                              0,
!                              0,
!                              LR_LOADFROMFILE|LR_CREATEDIBSECTION);
      if (!bmp) {
        m_error = "Error loading button over bitmap " + overBmp;
--- 483,488 ----
      CString overBmp = path + buffer;
  
!     bmp = LoadImage(overBmp);
! 
      if (!bmp) {
        m_error = "Error loading button over bitmap " + overBmp;

Index: skin.h
===================================================================
RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/skin.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** skin.h	4 Nov 2003 14:09:53 -0000	1.3
--- skin.h	29 Feb 2004 13:04:54 -0000	1.4
***************
*** 154,157 ****
--- 154,158 ----
  
   private:
+   HBITMAP LoadImage(const char *);
    bool ReadButton(const char *, int);
    static bool ParseRect(char *, RECT &);