Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Z
zmap
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Iterations
Wiki
Requirements
Jira
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
ensembl-gh-mirror
zmap
Commits
14618c45
Commit
14618c45
authored
16 years ago
by
rds
Browse files
Options
Downloads
Patches
Plain Diff
*** empty log message ***
parent
66e52b85
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/zmapFeature/zmapFeature.c
+10
-4
10 additions, 4 deletions
src/zmapFeature/zmapFeature.c
with
10 additions
and
4 deletions
src/zmapFeature/zmapFeature.c
+
10
−
4
View file @
14618c45
...
...
@@ -27,9 +27,9 @@
*
* Exported functions: See zmapView_P.h
* HISTORY:
* Last edited: Feb 1
2
16:
06
2009 (
edgrif
)
* Last edited: Feb 1
6
16:
27
2009 (
rds
)
* Created: Fri Jul 16 13:05:58 2004 (edgrif)
* CVS info: $Id: zmapFeature.c,v 1.10
7
2009-0
2-12 16:07:20 edgrif
Exp $
* CVS info: $Id: zmapFeature.c,v 1.10
8
2009-0
4-01 15:50:57 rds
Exp $
*-------------------------------------------------------------------
*/
...
...
@@ -399,7 +399,7 @@ ZMapFeatureAny zmapFeatureAnyCopy(ZMapFeatureAny orig_feature_any, GDestroyNotif
new_block
->
sequence
.
type
=
ZMAPSEQUENCE_NONE
;
new_block
->
sequence
.
length
=
0
;
new_block
->
sequence
.
sequence
=
NULL
;
break
;
}
case
ZMAPFEATURE_STRUCT_FEATURESET
:
...
...
@@ -2118,7 +2118,6 @@ static ZMapFeatureContextExecuteStatus mergePreCB(GQuark key,
}
}
/* general code start */
zMapAssert
(
view_path_ptr
&&
view_path_parent_ptr
&&
...
...
@@ -2181,6 +2180,13 @@ static ZMapFeatureContextExecuteStatus mergePreCB(GQuark key,
/* keep diff feature -> parent up to date with the view parent */
if
(
new
)
(
*
diff_path_ptr
)
->
parent
=
*
view_path_parent_ptr
;
if
(
feature_any
->
struct_type
==
ZMAPFEATURE_STRUCT_BLOCK
&&
(
*
view_path_ptr
)
->
unique_id
==
feature_any
->
unique_id
)
{
((
ZMapFeatureBlock
)(
*
view_path_ptr
))
->
features_start
=
((
ZMapFeatureBlock
)(
feature_any
))
->
features_start
;
((
ZMapFeatureBlock
)(
*
view_path_ptr
))
->
features_end
=
((
ZMapFeatureBlock
)(
feature_any
))
->
features_end
;
}
}
/* general code stop */
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment