[Mplayer-cvslog] CVS: main/Gui/bitmap Makefile,NONE,1.1 bitmap.c,NONE,1.1 bitmap.h,NONE,1.1 bitmap.mak,NONE,1.1

[Arpi of Ize]

Update of /cvsroot/mplayer/main/Gui/bitmap
In directory mplayer:/var/tmp.root/cvs-serv13203/bitmap

Added Files:
	Makefile bitmap.c bitmap.h bitmap.mak 
Log Message:
GUI version n-1

--- NEW FILE ---

include ../config.mak

SRCS    = bitmap.c tga/tga.c jpeg/jpeg.c bmp/bmp.c
OBJS 	= bitmap.o tga/tga.o jpeg/jpeg.o bmp/bmp.o

.SUFFIXES: .c .o

.c.o:
	$(CC) -c $(CFLAGS) -o $@ $<

### TARGETS ###

all:
	@( [ -e $(JPEGLIB) ] || \
	   make -C jpeg/jpeg-6b libjpeg.a )
#	 ( make -C jpeg/jpeg-6b libjpeg.a && mv jpeg/jpeg-6b/libjpeg.a "$(JPEGLIB)" ) )
	$(MAKE) $(OBJS)
	ar rc libbitmap.a $(OBJS) jpeg/jpeg-6b/*.o
	ranlib libbitmap.a
	mv libbitmap.a ../libs

#comp: 
#	$(MAKE) $(OBJS)

clean:
	$(MAKE) -C jpeg/jpeg-6b clean
	-rm -rf $(OBJS) *.o *~ *.bak $(JPEGLIB)

dep:	depend

depend:
	makedepend -- $(CFLAGS) -- $(SRCS) &>/dev/null

# DO NOT DELETE

bitmap.o: /usr/include/stdlib.h /usr/include/features.h
bitmap.o: /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h
bitmap.o: /usr/lib/gcc-lib/i386-linux/2.95.2/include/stddef.h
bitmap.o: /usr/include/sys/types.h /usr/include/bits/types.h
bitmap.o: /usr/include/time.h /usr/include/endian.h
bitmap.o: /usr/include/bits/endian.h /usr/include/sys/select.h
bitmap.o: /usr/include/bits/select.h /usr/include/bits/sigset.h
bitmap.o: /usr/include/sys/sysmacros.h /usr/include/alloca.h
bitmap.o: /usr/include/stdio.h
bitmap.o: /usr/lib/gcc-lib/i386-linux/2.95.2/include/stdarg.h
bitmap.o: /usr/include/libio.h /usr/include/_G_config.h
bitmap.o: /usr/include/bits/stdio_lim.h bitmap.h tga/tga.h bitmap.h
bitmap.o: jpeg/jpeg.h bmp/bmp.h
tga/tga.o: /usr/include/string.h /usr/include/features.h
tga/tga.o: /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h
tga/tga.o: /usr/lib/gcc-lib/i386-linux/2.95.2/include/stddef.h
tga/tga.o: /usr/include/stdio.h
tga/tga.o: /usr/lib/gcc-lib/i386-linux/2.95.2/include/stdarg.h
tga/tga.o: /usr/include/bits/types.h /usr/include/libio.h
tga/tga.o: /usr/include/_G_config.h /usr/include/bits/stdio_lim.h
tga/tga.o: /usr/include/stdlib.h /usr/include/sys/types.h /usr/include/time.h
tga/tga.o: /usr/include/endian.h /usr/include/bits/endian.h
tga/tga.o: /usr/include/sys/select.h /usr/include/bits/select.h
tga/tga.o: /usr/include/bits/sigset.h /usr/include/sys/sysmacros.h
tga/tga.o: /usr/include/alloca.h tga/tga.h bitmap.h
jpeg/jpeg.o: /usr/include/setjmp.h /usr/include/features.h
jpeg/jpeg.o: /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h
jpeg/jpeg.o: /usr/include/bits/setjmp.h /usr/include/bits/sigset.h
jpeg/jpeg.o: /usr/include/string.h
jpeg/jpeg.o: /usr/lib/gcc-lib/i386-linux/2.95.2/include/stddef.h
jpeg/jpeg.o: /usr/include/stdlib.h /usr/include/sys/types.h
jpeg/jpeg.o: /usr/include/bits/types.h /usr/include/time.h
jpeg/jpeg.o: /usr/include/endian.h /usr/include/bits/endian.h
jpeg/jpeg.o: /usr/include/sys/select.h /usr/include/bits/select.h
jpeg/jpeg.o: /usr/include/sys/sysmacros.h /usr/include/alloca.h
jpeg/jpeg.o: /usr/include/stdio.h
jpeg/jpeg.o: /usr/lib/gcc-lib/i386-linux/2.95.2/include/stdarg.h
jpeg/jpeg.o: /usr/include/libio.h /usr/include/_G_config.h
jpeg/jpeg.o: /usr/include/bits/stdio_lim.h jpeg/jpeg-6b/jpeglib.h
jpeg/jpeg.o: jpeg/jpeg-6b/jconfig.h jpeg/jpeg-6b/jmorecfg.h bitmap.h
jpeg/jpeg.o: jpeg/jpeg.h
bmp/bmp.o: /usr/include/stdlib.h /usr/include/features.h
bmp/bmp.o: /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h
bmp/bmp.o: /usr/lib/gcc-lib/i386-linux/2.95.2/include/stddef.h
bmp/bmp.o: /usr/include/sys/types.h /usr/include/bits/types.h
bmp/bmp.o: /usr/include/time.h /usr/include/endian.h
bmp/bmp.o: /usr/include/bits/endian.h /usr/include/sys/select.h
bmp/bmp.o: /usr/include/bits/select.h /usr/include/bits/sigset.h
bmp/bmp.o: /usr/include/sys/sysmacros.h /usr/include/alloca.h
bmp/bmp.o: /usr/include/stdio.h
bmp/bmp.o: /usr/lib/gcc-lib/i386-linux/2.95.2/include/stdarg.h
bmp/bmp.o: /usr/include/libio.h /usr/include/_G_config.h
bmp/bmp.o: /usr/include/bits/stdio_lim.h bmp/bmp.h bitmap.h

--- NEW FILE ---

#include <stdlib.h>
#include <stdio.h>

#include "bitmap.h"
#include "../error.h"

#define BMP 1
#define TGA 2
#define PNG 3
#define TGAPACKED 4

extern char * strcat( char * dest,const char * src );

int conv24to32( txSample * bf )
{
 unsigned char * tmpImage;
 int             i,c;

 if ( bf->BPP == 24 )
  {
   tmpImage=bf->Image;
   bf->ImageSize=bf->Width * bf->Height * 4;
   bf->BPP=32;
   if ( ( bf->Image=malloc( bf->ImageSize ) ) == NULL )
    {
     #ifdef DEBUG
      dbprintf( 4,"[bitmap] Not enough memory for image.\n" );
     #endif
     return 1;
    }
   memset( bf->Image,0,bf->ImageSize );
   for ( c=0,i=0;i < bf->Width * bf->Height * 3; )
    {
     bf->Image[c++]=tmpImage[i++];
     bf->Image[c++]=tmpImage[i++];
     bf->Image[c++]=tmpImage[i++]; c++;
    }
   free( tmpImage );
  }
 return 0;
}

void bgr2rgb( txSample * bf )
{
 unsigned char c;
 int           i;

 for ( i=0;i < bf->ImageSize;i+=4 )
  {
   c=bf->Image[i];
   bf->Image[i]=bf->Image[i+2];
   bf->Image[i+2]=c;
  }
}

void Normalize( txSample * bf )
{
 int           i;

 for ( i=0;i < bf->ImageSize;i+=4 ) bf->Image[i+3]=0;
}

unsigned char tmp[512];

unsigned char * fExist( unsigned char * fname )
{
 FILE          * fl;
 unsigned char   ext[][6] = { ".tga\0",".TGA\0",".png\0",".PNG\0",".bmp\0",".BMP\0"  };
 int             i;

 fl=fopen( fname,"rb" );
 if ( fl != NULL )
  {
   fclose( fl );
   return fname;
  }
 for ( i=0;i<10;i++ )
  {
   strcpy( tmp,fname );
   strcat( tmp,ext[i] );
   fl=fopen( tmp,"rb" );
   if ( fl != NULL )
    {
     fclose( fl );
     return tmp;
    }
  }
 return NULL;
}

int aComp( unsigned char * b1,unsigned char * b2,int size )
{
 int i;
 for( i=0;i<size;i++ ) if ( b1[i] != b2[i] ) return 0;
 return 1;
}

int GetFileType( char * fname )
{
 FILE * fl;
 unsigned char buffer[10];
 unsigned char  bmp[2] = { 0x42,0x4d };
 unsigned char  tga[7] = { 0x00,0x02,0x00,0x00,0x00,0x00,0x00 };
 unsigned char ptga[7] = { 0x00,0x0a,0x00,0x00,0x00,0x00,0x00 };
 unsigned char  png[8] = { 0x89,0x50,0x4e,0x47,0x0d,0x0a,0x1a,0x0a };

 if ( ( fl=fopen( fname,"rb" ) ) == NULL ) return -1;
 fread( buffer,1,10,fl );
 fclose( fl );

 if ( aComp( buffer,bmp,2 ) ) return BMP;        // --- bmp
 if ( aComp( &buffer[1],tga,8 ) ) return TGA;        // --- tga
 if ( aComp( &buffer[1],ptga,7 ) ) return TGAPACKED; // --- tga
 if ( aComp( buffer,png,8 ) ) return PNG;        // --- png
 return 0;                                       // --- others
}

int bpRead( char * fname, txSample * bf )
{
 int bgr = 0;
 int i;

 fname=fExist( fname );
 if ( fname == NULL ) return -2;
 switch ( GetFileType( fname ) )
  {
   case BMP:
        i=bmpRead( fname,bf );
        switch ( i )
         {
          case 0:  break;
          case 3:  return -1;
          default: return -3;
         }
        break;
   case TGA:
        i=tgaRead( fname,bf );
        switch ( i )
         {
          case 0:  break;
          case 3:  return -1;
          default: return -4;
         }
        break;
   case PNG:
        if ( pngRead( fname,bf ) ) return -5;
        bgr=1;
        break;
   case TGAPACKED:
        #ifdef DEBUG
         dbprintf( 4,"[bitmap] sorry, packed TGA not supported.\n" );
        #endif
        return -6;
   default:
     {
      #ifdef DEBUG
       dbprintf( 4,"[bitmap] Unknown file type ( %s ).\n",fname );
      #endif
      return -7;
     }
  }
 if ( bf->BPP < 24 )
  {
   #ifdef DEBUG
    dbprintf( 4,"[bitmap] sorry, 16 or less bitmaps not supported.\n" );
   #endif
   return -1;
  }
 if ( conv24to32( bf ) ) return -8;
 if ( bgr ) bgr2rgb( bf );
 Normalize( bf );
 return 0;
}

--- NEW FILE ---

#ifndef __MYSAMPLE
#define __MYSAMPLE

typedef struct _txSample
{
 unsigned int  Width;
 unsigned int  Height;
 unsigned int  BPP;
 unsigned long ImageSize;
 char *        Image;
} txSample;

#include "tga/tga.h"
#include "bmp/bmp.h"
#include "png/png.h"

extern int bpRead( char * fname, txSample * bf );
extern int conv24to32( txSample * bf );

#endif
--- NEW FILE ---

BITMAPOBJS =                   \
bitmap/bitmap.o                \
bitmap/tga/tga.o               \
bitmap/bmp/bmp.o               \
bitmap/png/png.o               


BITMAPSRCS =                   \
bitmap/bitmap.c                \
bitmap/tga/tga.c               \
bitmap/bmp/bmp.c               \
bitmap/png/png.c