[CHG] Moved "#include <ogc/conf.h>" from .h to .c

This commit is contained in:
Crayon2000 2009-03-06 05:07:50 +00:00
parent 989faaabcc
commit 977b523d70
2 changed files with 9 additions and 10 deletions

View file

@ -13,6 +13,7 @@
#include "../lib/libpng/pngu/pngu.h" #include "../lib/libpng/pngu/pngu.h"
#include "../lib/libjpeg/jpeglib.h" #include "../lib/libjpeg/jpeglib.h"
#include "GRRLIB.h" #include "GRRLIB.h"
#include <ogc/conf.h>
#include <fat.h> #include <fat.h>
#define DEFAULT_FIFO_SIZE (256 * 1024) /**< GX fifo buffer size. */ #define DEFAULT_FIFO_SIZE (256 * 1024) /**< GX fifo buffer size. */
@ -900,10 +901,9 @@ void GRRLIB_Init() {
if(rmode == NULL) if(rmode == NULL)
return; return;
/* Widescreen patch by CashMan's Productions (http://www.CashMan-Productions.fr.nf) */ // Widescreen patch by CashMan's Productions (http://www.CashMan-Productions.fr.nf)
if (CONF_GetAspectRatio() == CONF_ASPECT_16_9) if(CONF_GetAspectRatio() == CONF_ASPECT_16_9) {
{ rmode->viWidth = 678;
rmode->viWidth = 678;
rmode->viXOrigin = (VI_MAX_WIDTH_NTSC - 678)/2; rmode->viXOrigin = (VI_MAX_WIDTH_NTSC - 678)/2;
} }
@ -1020,16 +1020,16 @@ void GRRLIB_Exit() {
/** /**
* Make a PNG screenshot on the SD card. * Make a PNG screenshot on the SD card.
* @param File Name of the file to write. * libfat is required to use the function.
* @return True if every thing worked, false otherwise. * @param File name of the file to write.
* @return true if every thing worked, false otherwise.
*/ */
bool GRRLIB_ScrShot(const char* File) bool GRRLIB_ScrShot(const char* File)
{ {
IMGCTX pngContext;
int ErrorCode = -1; int ErrorCode = -1;
IMGCTX pngContext;
if(fatInitDefault() && (pngContext = PNGU_SelectImageFromDevice(File))) if(fatInitDefault() && (pngContext = PNGU_SelectImageFromDevice(File))) {
{
ErrorCode = PNGU_EncodeFromYCbYCr(pngContext, 640, 480, xfb[fb], 0); ErrorCode = PNGU_EncodeFromYCbYCr(pngContext, 640, 480, xfb[fb], 0);
PNGU_ReleaseImageContext(pngContext); PNGU_ReleaseImageContext(pngContext);
} }

View file

@ -14,7 +14,6 @@
*/ */
#include <gccore.h> #include <gccore.h>
#include <ogc/conf.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {