← Back to branch summary

~ubuntu-branches/debian/sid/3depict/sid

« back to all changes in this revision

Viewing changes to src/common.h

  • Committer: Bazaar Package Importer
  • Author(s): D Haley
  • Date: 2010-09-22 20:09:24 UTC
  • mfrom: (1.1.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20100922200924-bkyorwswrntnst4d
Tags: 0.0.2-1
* New upstream version
* Enable parallel build

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/common.h
110
110
};
111
111
//----
112
112
 
 
113
//C file peek function
 
114
inline int fpeek(FILE *stream)
 
115
{
 
116
        int c;
 
117
 
 
118
        c = fgetc(stream);
 
119
        ungetc(c, stream);
 
120
 
 
121
        return c;
 
122
}
 
123
 
113
124
 
114
125
//!Property types for wxPropertyGrid
115
126
enum
134
145
                                                        RandNumGen &rng, size_t num,unsigned int &progress,bool (*callback)())
135
146
{
136
147
        //If there are not enough points, just copy it across in whole
137
 
        if(source.size() < num)
 
148
        if(source.size() <= num)
138
149
        {
139
150
                num=source.size();
140
151
                result.resize(source.size());