Skip to content

Commit b1ea269

Browse files
committed
don't use inline functions together with LIBDE265_API
1 parent 8bd18a9 commit b1ea269

File tree

2 files changed

+28
-6
lines changed

2 files changed

+28
-6
lines changed

libde265/image-io.cc

+22
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,9 @@ ImageSource::ImageSource()
3030
}
3131

3232

33+
ImageSource::~ImageSource() { }
34+
35+
3336
ImageSource_YUV::ImageSource_YUV()
3437
: mFH(NULL)
3538
{
@@ -131,6 +134,23 @@ void ImageSource_YUV::skip_frames(int n)
131134
}
132135

133136

137+
int ImageSource_YUV::get_width() const
138+
{
139+
return width;
140+
}
141+
142+
143+
int ImageSource_YUV::get_height() const
144+
{
145+
return height;
146+
}
147+
148+
149+
150+
151+
ImageSink::~ImageSink() { }
152+
153+
ImageSink_YUV::ImageSink_YUV() : mFH(NULL) { }
134154

135155

136156
ImageSink_YUV::~ImageSink_YUV()
@@ -180,6 +200,8 @@ void ImageSink_YUV::send_image(const de265_image* img)
180200

181201

182202

203+
PacketSink::~PacketSink() { }
204+
183205
PacketSink_File::PacketSink_File()
184206
: mFH(NULL)
185207
{

libde265/image-io.h

+6-6
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class ImageSource
3131
{
3232
public:
3333
LIBDE265_API ImageSource();
34-
virtual LIBDE265_API ~ImageSource() { }
34+
virtual LIBDE265_API ~ImageSource();
3535

3636
//enum ImageStatus { Available, Waiting, EndOfVideo };
3737

@@ -57,8 +57,8 @@ class ImageSource_YUV : public ImageSource
5757
virtual LIBDE265_API de265_image* get_image(bool block=true);
5858
virtual LIBDE265_API void skip_frames(int n);
5959

60-
virtual LIBDE265_API int get_width() const { return width; }
61-
virtual LIBDE265_API int get_height() const { return height; }
60+
virtual LIBDE265_API int get_width() const;
61+
virtual LIBDE265_API int get_height() const;
6262

6363
private:
6464
FILE* mFH;
@@ -74,15 +74,15 @@ class ImageSource_YUV : public ImageSource
7474
class ImageSink
7575
{
7676
public:
77-
virtual LIBDE265_API ~ImageSink() { }
77+
virtual LIBDE265_API ~ImageSink();
7878

7979
virtual LIBDE265_API void send_image(const de265_image* img) = 0;
8080
};
8181

8282
class ImageSink_YUV : public ImageSink
8383
{
8484
public:
85-
LIBDE265_API ImageSink_YUV() : mFH(NULL) { }
85+
LIBDE265_API ImageSink_YUV();
8686
LIBDE265_API ~ImageSink_YUV();
8787

8888
bool LIBDE265_API set_filename(const char* filename);
@@ -98,7 +98,7 @@ class ImageSink_YUV : public ImageSink
9898
class PacketSink
9999
{
100100
public:
101-
virtual LIBDE265_API ~PacketSink() { }
101+
virtual LIBDE265_API ~PacketSink();
102102

103103
virtual LIBDE265_API void send_packet(const uint8_t* data, int n) = 0;
104104
};

0 commit comments

Comments
 (0)