From 959831f4ef5a3e797f576c3de08cd65032c997ad Mon Sep 17 00:00:00 2001 From: David Walter Seikel Date: Sun, 13 Jan 2013 18:54:10 +1000 Subject: Remove damned ancient DOS line endings from Irrlicht. Hopefully I did not go overboard. --- libraries/irrlicht-1.8/source/Irrlicht/CImage.h | 254 ++++++++++++------------ 1 file changed, 127 insertions(+), 127 deletions(-) (limited to 'libraries/irrlicht-1.8/source/Irrlicht/CImage.h') diff --git a/libraries/irrlicht-1.8/source/Irrlicht/CImage.h b/libraries/irrlicht-1.8/source/Irrlicht/CImage.h index 82b34c7..e97458b 100644 --- a/libraries/irrlicht-1.8/source/Irrlicht/CImage.h +++ b/libraries/irrlicht-1.8/source/Irrlicht/CImage.h @@ -1,127 +1,127 @@ -// Copyright (C) 2002-2012 Nikolaus Gebhardt -// This file is part of the "Irrlicht Engine". -// For conditions of distribution and use, see copyright notice in irrlicht.h - -#ifndef __C_IMAGE_H_INCLUDED__ -#define __C_IMAGE_H_INCLUDED__ - -#include "IImage.h" -#include "rect.h" - -namespace irr -{ -namespace video -{ - -//! IImage implementation with a lot of special image operations for -//! 16 bit A1R5G5B5/32 Bit A8R8G8B8 images, which are used by the SoftwareDevice. -class CImage : public IImage -{ -public: - - //! constructor from raw image data - /** \param useForeignMemory: If true, the image will use the data pointer - directly and own it from now on, which means it will also try to delete [] the - data when the image will be destructed. If false, the memory will by copied. */ - CImage(ECOLOR_FORMAT format, const core::dimension2d& size, - void* data, bool ownForeignMemory=true, bool deleteMemory = true); - - //! constructor for empty image - CImage(ECOLOR_FORMAT format, const core::dimension2d& size); - - //! destructor - virtual ~CImage(); - - //! Lock function. - virtual void* lock() - { - return Data; - } - - //! Unlock function. - virtual void unlock() {} - - //! Returns width and height of image data. - virtual const core::dimension2d& getDimension() const; - - //! Returns bits per pixel. - virtual u32 getBitsPerPixel() const; - - //! Returns bytes per pixel - virtual u32 getBytesPerPixel() const; - - //! Returns image data size in bytes - virtual u32 getImageDataSizeInBytes() const; - - //! Returns image data size in pixels - virtual u32 getImageDataSizeInPixels() const; - - //! returns mask for red value of a pixel - virtual u32 getRedMask() const; - - //! returns mask for green value of a pixel - virtual u32 getGreenMask() const; - - //! returns mask for blue value of a pixel - virtual u32 getBlueMask() const; - - //! returns mask for alpha value of a pixel - virtual u32 getAlphaMask() const; - - //! returns a pixel - virtual SColor getPixel(u32 x, u32 y) const; - - //! sets a pixel - virtual void setPixel(u32 x, u32 y, const SColor &color, bool blend = false ); - - //! returns the color format - virtual ECOLOR_FORMAT getColorFormat() const; - - //! returns pitch of image - virtual u32 getPitch() const { return Pitch; } - - //! copies this surface into another, scaling it to fit. - virtual void copyToScaling(void* target, u32 width, u32 height, ECOLOR_FORMAT format, u32 pitch=0); - - //! copies this surface into another, scaling it to fit. - virtual void copyToScaling(IImage* target); - - //! copies this surface into another - virtual void copyTo(IImage* target, const core::position2d& pos=core::position2d(0,0)); - - //! copies this surface into another - virtual void copyTo(IImage* target, const core::position2d& pos, const core::rect& sourceRect, const core::rect* clipRect=0); - - //! copies this surface into another, using the alpha mask, an cliprect and a color to add with - virtual void copyToWithAlpha(IImage* target, const core::position2d& pos, - const core::rect& sourceRect, const SColor &color, - const core::rect* clipRect = 0); - - //! copies this surface into another, scaling it to fit, appyling a box filter - virtual void copyToScalingBoxFilter(IImage* target, s32 bias = 0, bool blend = false); - - //! fills the surface with given color - virtual void fill(const SColor &color); - -private: - - //! assumes format and size has been set and creates the rest - void initData(); - - inline SColor getPixelBox ( s32 x, s32 y, s32 fx, s32 fy, s32 bias ) const; - - u8* Data; - core::dimension2d Size; - u32 BytesPerPixel; - u32 Pitch; - ECOLOR_FORMAT Format; - - bool DeleteMemory; -}; - -} // end namespace video -} // end namespace irr - - -#endif - +// Copyright (C) 2002-2012 Nikolaus Gebhardt +// This file is part of the "Irrlicht Engine". +// For conditions of distribution and use, see copyright notice in irrlicht.h + +#ifndef __C_IMAGE_H_INCLUDED__ +#define __C_IMAGE_H_INCLUDED__ + +#include "IImage.h" +#include "rect.h" + +namespace irr +{ +namespace video +{ + +//! IImage implementation with a lot of special image operations for +//! 16 bit A1R5G5B5/32 Bit A8R8G8B8 images, which are used by the SoftwareDevice. +class CImage : public IImage +{ +public: + + //! constructor from raw image data + /** \param useForeignMemory: If true, the image will use the data pointer + directly and own it from now on, which means it will also try to delete [] the + data when the image will be destructed. If false, the memory will by copied. */ + CImage(ECOLOR_FORMAT format, const core::dimension2d& size, + void* data, bool ownForeignMemory=true, bool deleteMemory = true); + + //! constructor for empty image + CImage(ECOLOR_FORMAT format, const core::dimension2d& size); + + //! destructor + virtual ~CImage(); + + //! Lock function. + virtual void* lock() + { + return Data; + } + + //! Unlock function. + virtual void unlock() {} + + //! Returns width and height of image data. + virtual const core::dimension2d& getDimension() const; + + //! Returns bits per pixel. + virtual u32 getBitsPerPixel() const; + + //! Returns bytes per pixel + virtual u32 getBytesPerPixel() const; + + //! Returns image data size in bytes + virtual u32 getImageDataSizeInBytes() const; + + //! Returns image data size in pixels + virtual u32 getImageDataSizeInPixels() const; + + //! returns mask for red value of a pixel + virtual u32 getRedMask() const; + + //! returns mask for green value of a pixel + virtual u32 getGreenMask() const; + + //! returns mask for blue value of a pixel + virtual u32 getBlueMask() const; + + //! returns mask for alpha value of a pixel + virtual u32 getAlphaMask() const; + + //! returns a pixel + virtual SColor getPixel(u32 x, u32 y) const; + + //! sets a pixel + virtual void setPixel(u32 x, u32 y, const SColor &color, bool blend = false ); + + //! returns the color format + virtual ECOLOR_FORMAT getColorFormat() const; + + //! returns pitch of image + virtual u32 getPitch() const { return Pitch; } + + //! copies this surface into another, scaling it to fit. + virtual void copyToScaling(void* target, u32 width, u32 height, ECOLOR_FORMAT format, u32 pitch=0); + + //! copies this surface into another, scaling it to fit. + virtual void copyToScaling(IImage* target); + + //! copies this surface into another + virtual void copyTo(IImage* target, const core::position2d& pos=core::position2d(0,0)); + + //! copies this surface into another + virtual void copyTo(IImage* target, const core::position2d& pos, const core::rect& sourceRect, const core::rect* clipRect=0); + + //! copies this surface into another, using the alpha mask, an cliprect and a color to add with + virtual void copyToWithAlpha(IImage* target, const core::position2d& pos, + const core::rect& sourceRect, const SColor &color, + const core::rect* clipRect = 0); + + //! copies this surface into another, scaling it to fit, appyling a box filter + virtual void copyToScalingBoxFilter(IImage* target, s32 bias = 0, bool blend = false); + + //! fills the surface with given color + virtual void fill(const SColor &color); + +private: + + //! assumes format and size has been set and creates the rest + void initData(); + + inline SColor getPixelBox ( s32 x, s32 y, s32 fx, s32 fy, s32 bias ) const; + + u8* Data; + core::dimension2d Size; + u32 BytesPerPixel; + u32 Pitch; + ECOLOR_FORMAT Format; + + bool DeleteMemory; +}; + +} // end namespace video +} // end namespace irr + + +#endif + -- cgit v1.1