mirror of https://github.com/axmolengine/axmol.git
Merge pull request #5946 from boyu0/iss3804_change_image_private_to_protected
closed #3804: Change private functions and variables in Image class to protected, since its subclasses may need them.
This commit is contained in:
commit
093b792221
|
@ -155,7 +155,7 @@ protected:
|
|||
bool saveImageToPNG(const std::string& filePath, bool isToRGB = true);
|
||||
bool saveImageToJPG(const std::string& filePath);
|
||||
|
||||
private:
|
||||
protected:
|
||||
/**
|
||||
@brief Determine how many mipmaps can we have.
|
||||
Its same as define but it respects namespaces
|
||||
|
@ -175,7 +175,7 @@ private:
|
|||
std::string _filePath;
|
||||
|
||||
|
||||
private:
|
||||
protected:
|
||||
// noncopyable
|
||||
Image(const Image& rImg);
|
||||
Image & operator=(const Image&);
|
||||
|
|
Loading…
Reference in New Issue