X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fcore%2Ftexture1d.h;h=225cb0de2ec9f32e3f90fb2a74d818b546426090;hp=09d805e7869f8afd2819596bab336a8db23389a8;hb=3a1b9cbe2441ae670a97541dc8ccb0a2860c8302;hpb=9b3bce7ae76ff8c0c81315d2505ea96bf422a318 diff --git a/source/core/texture1d.h b/source/core/texture1d.h index 09d805e7..225cb0de 100644 --- a/source/core/texture1d.h +++ b/source/core/texture1d.h @@ -36,13 +36,7 @@ public: { storage(make_pixelformat(c, UNSIGNED_BYTE), w, l); } void allocate(unsigned); -private: - void allocate_(unsigned); -public: void image(unsigned, const void *); -private: - void image_(unsigned, const void *); -public: DEPRECATED void image(unsigned, PixelComponents, DataType, const void *); void sub_image(unsigned, int, unsigned, const void *); DEPRECATED void sub_image(unsigned, int, unsigned, PixelComponents, DataType, const void *); @@ -56,7 +50,7 @@ private: public: virtual AsyncLoader *load(IO::Seekable &, const Resources * = 0) { return 0; } - virtual UInt64 get_data_size() const; + virtual std::uint64_t get_data_size() const; virtual void unload() { } };