MyPNG.h (pymol-open-source-2.2.0) | : | MyPNG.h (pymol-open-source-2.3.0) | ||
---|---|---|---|---|
skipping to change at line 20 | skipping to change at line 20 | |||
H* ------------------------------------------------------------------- | H* ------------------------------------------------------------------- | |||
I* Additional authors of this source file include: | I* Additional authors of this source file include: | |||
-* | -* | |||
-* | -* | |||
-* | -* | |||
Z* ------------------------------------------------------------------- | Z* ------------------------------------------------------------------- | |||
*/ | */ | |||
#ifndef _H_MyPNG | #ifndef _H_MyPNG | |||
#define _H_MyPNG | #define _H_MyPNG | |||
#include <memory> | ||||
#include <vector> | ||||
#include "Image.h" | ||||
#include "LangUtil.h" | ||||
#include"PyMOLGlobals.h" | #include"PyMOLGlobals.h" | |||
#define cMyPNG_FormatPNG 0 | #define cMyPNG_FormatPNG 0 | |||
#define cMyPNG_FormatPPM 1 | #define cMyPNG_FormatPPM 1 | |||
int MyPNGWrite(PyMOLGlobals * G, const char *file_name, const unsigned char *p, | int MyPNGWrite(const char *file_name, const pymol::Image& img, | |||
unsigned int width, unsigned int height, float dpi, int format, i | const float dpi, const int format, const int quiet, const float s | |||
nt quiet, | creen_gamma, const float file_gamma, void * io_ptr = nullptr); | |||
void * io_ptr = NULL); | ||||
int MyPNGRead(const char *file_name, unsigned char **p_ptr, unsigned int *width_ | std::unique_ptr<pymol::Image> MyPNGRead(const char *file_name); | |||
ptr, | ||||
unsigned int *height_ptr); | ||||
#endif | #endif | |||
End of changes. 2 change blocks. | ||||
7 lines changed or deleted | 11 lines changed or added |