← Back to branch summary

~ubuntu-branches/ubuntu/trusty/xmedcon/trusty-proposed

« back to all changes in this revision

Viewing changes to libs/dicom/basic.c

  • Committer: Bazaar Package Importer
  • Author(s): Stephan Hermann
  • Date: 2006-12-21 14:44:32 UTC
  • mfrom: (1.1.6 upstream) (4 etch)
  • mto: This revision was merged to the branch mainline in revision 5.
  • Revision ID: james.westby@ubuntu.com-20061221144432-mej874g503sahblt
Tags: 0.9.9.4-1ubuntu1
* Merge from debian unstable, remaining changes:
  - debian/rules: dh_iconcache

Show diffs side-by-side

added added

removed removed

Lines of Context:
libs/dicom/basic.c
2
2
 * libdicom by Tony Voet *
3
3
 *************************/
4
4
/*
5
 
 * $Id: basic.c,v 1.23 2005/12/02 23:06:44 enlf Exp $
 
5
 * $Id: basic.c,v 1.26 2006/12/08 21:50:24 enlf Exp $
6
6
 */
7
7
 
8
8
#include <stdio.h>
45
45
syntax,endian,filesyntax,pixelsyntax,encapsyntax;
46
46
 
47
47
#if MEDCON_INTEGRATED
48
 
/* eNlf: routine for setting the stream from outside the library    */
49
 
/* eNlf: in MedCon this library doesn't have to open or close steam */         
 
48
/* eNlf: routine for setting the stream from outside the library     */
 
49
/* eNlf: in MedCon this library doesn't have to open or close stream */         
50
50
/********
51
51
 * init *
52
52
 ********/
1032
1032
          return(-1);
1033
1033
        break;
1034
1034
    case COMPRESSED_LOSSLESS:
 
1035
        if (s->w > 4096) {
 
1036
          dicom_log(WARNING,"LJPG compiled with 4096-wide image limit");
 
1037
          dicom_log(WARNING,"Check out 'jpegutil.c' file to increase");
 
1038
          return(-2);
 
1039
        }
1035
1040
        if (mdc_dicom_decomp_ljpg(stream,(U16*)e->value.OB,e->length
1036
1041
                                        ,(unsigned)s->alloc*s->samples))
1037
1042
          return(-2);