summaryrefslogtreecommitdiff
path: root/src/input/pnm.c
diff options
context:
space:
mode:
authorMiguel Freitas <miguelfreitas@users.sourceforge.net>2003-01-31 14:06:03 +0000
committerMiguel Freitas <miguelfreitas@users.sourceforge.net>2003-01-31 14:06:03 +0000
commit8695f5d8c99952a89f59b314c58a5e0bbd8a6e6e (patch)
tree47af2fb780645208a11b0e3bcea97e709c050330 /src/input/pnm.c
parent112c134d4636786c1b0e22839bd782d9554b961e (diff)
downloadxine-lib-8695f5d8c99952a89f59b314c58a5e0bbd8a6e6e.tar.gz
xine-lib-8695f5d8c99952a89f59b314c58a5e0bbd8a6e6e.tar.bz2
- MAX_PREVIEW_SIZE = 4096
- new fb driver with zero copy CVS patchset: 4058 CVS date: 2003/01/31 14:06:03
Diffstat (limited to 'src/input/pnm.c')
-rw-r--r--src/input/pnm.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/src/input/pnm.c b/src/input/pnm.c
index eb1a1c47a..d0a9b0c9e 100644
--- a/src/input/pnm.c
+++ b/src/input/pnm.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: pnm.c,v 1.10 2003/01/22 16:33:24 holstsn Exp $
+ * $Id: pnm.c,v 1.11 2003/01/31 14:06:17 miguelfreitas Exp $
*
* pnm protocol implementation
* based upon code from joschka
@@ -930,10 +930,14 @@ int pnm_read (pnm_t *this, char *data, int len) {
return len;
}
-int pnm_peek_header (pnm_t *this, char *data) {
+int pnm_peek_header (pnm_t *this, char *data, int maxsize) {
- memcpy (data, this->header, this->header_len);
- return this->header_len;
+ int len;
+
+ len = (this->header_len < maxsize) ? this->header_len : maxsize;
+
+ memcpy(data, this->header, len);
+ return len;
}
void pnm_close(pnm_t *p) {