removed getuint.[ch], replaced 1 place of usage by direct code.
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@10867 67ed7778-7388-44ab-90cf-0a291f65f57c
This commit is contained in:
@@ -4,8 +4,8 @@ camlibdoc_DATA += sonydscf1/README.sonydscf1
|
||||
EXTRA_LTLIBRARIES += sony_dscf1.la
|
||||
|
||||
sony_dscf1_la_SOURCES = \
|
||||
sonydscf1/command.c sonydscf1/getuint.c sonydscf1/chotplay.c \
|
||||
sonydscf1/command.h sonydscf1/getuint.h sonydscf1/chotplay.h \
|
||||
sonydscf1/command.c sonydscf1/chotplay.c \
|
||||
sonydscf1/command.h sonydscf1/chotplay.h \
|
||||
sonydscf1/sonydscf1.c sonydscf1/sonydscf1.h \
|
||||
sonydscf1/pmp.h sonydscf1/common.h
|
||||
sony_dscf1_la_LDFLAGS = $(camlib_ldflags)
|
||||
|
||||
@@ -14,7 +14,6 @@
|
||||
#include "chotplay.h"
|
||||
#include "common.h"
|
||||
#include "command.h"
|
||||
#include "getuint.h"
|
||||
#include "pmp.h"
|
||||
|
||||
#define MAX_PICTURE_NUM 200
|
||||
@@ -77,7 +76,7 @@ make_jpeg_comment(u_char *buf, u_char *jpeg_comment)
|
||||
}
|
||||
|
||||
/* shutter speed */
|
||||
shutter = (int)get_u_short(buf+PMP_SPEED);
|
||||
shutter = (buf[PMP_SPEED]<<8)|buf[PMP_SPEED+1];
|
||||
|
||||
i = 0;
|
||||
while (1) {
|
||||
|
||||
@@ -1,23 +0,0 @@
|
||||
#include "config.h"
|
||||
#include <sys/types.h>
|
||||
|
||||
#include "getuint.h"
|
||||
|
||||
u_short
|
||||
get_u_short(buf)
|
||||
u_char *buf;
|
||||
{
|
||||
return ((u_short)buf[0] << 8) | buf[1];
|
||||
}
|
||||
|
||||
u_int
|
||||
get_u_int(buf)
|
||||
u_char *buf;
|
||||
{
|
||||
u_int t;
|
||||
|
||||
t = (((u_int)buf[0] << 8) | buf[1]) << 16;;
|
||||
t |= ((u_int)buf[2] << 8) | buf[3];;
|
||||
return t;
|
||||
}
|
||||
|
||||
@@ -1,2 +0,0 @@
|
||||
u_short get_u_short (u_char *buf);
|
||||
u_int get_u_int (u_char *buf);
|
||||
Reference in New Issue
Block a user